updated translations

36 files changed, 64543 insertions, 62584 deletions

diff --git a/po/be.po b/po/be.po
index 5052de4bb..0b33ae4a7 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:42+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -18,77 +18,83 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Рахункі"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Выберыце малюнак"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Вы не злучаны з серверам"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Больш не пытацца"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Спіс прыватнасці"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Забарона казання для %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Працягнуць"
 
@@ -152,232 +158,224 @@ msgstr ""
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Адправіць _асобнае паведамленне"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Выканаць загад..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Транспарты"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "Змяніць _імя"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "Вы_даліць"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Асабістыя звесткі"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Адправіць _файл"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Захаваць файл як..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Захаваць файл як..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Апошняе паведамленне: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Людзі"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Дадаць чалавека..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Запыт на перадачу файла"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Прыватная размова"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Асабістыя звесткі"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Журнал"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Адключана"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Піша"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Усе станы"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Людзі"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Сысці з групавых размоў"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Сысці з групавых размоў"
+msgid "Rename…"
+msgstr "Змяніць _імя"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Змяніць _тэму"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Сысці з групавых размоў"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Выберыце малюнак"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Новая групавая размова"
+msgid "Configure…"
+msgstr "_Працягнуць"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Апісанне: %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Памылка злучэння"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Стандартныя паведамленні:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Змяніць м_янушку"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Голас"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Выканаць загад..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -385,270 +383,273 @@ msgstr[0] "%i дзён таму"
 msgstr[1] "%i дзён таму"
 msgstr[2] "%i дзён таму"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Піша"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Усе станы"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Дадаць чалавека..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Адправіць _асобнае паведамленне"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Пошук сервісаў"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Адмысловы"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Настаўленні"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Чорны спіс"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Змясціць у закладках"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Настаўленні пакоя"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Адміністратар"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "Ад_правіць паведамленне серверу"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Вызначыць MOTD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Абнавіць MOTD"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Выдаліць MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Дадаць чалавека..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Змяніць рахунак"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Змяніць рахунак"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Рахункі"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Скапіяваць JID / паштовы адрас"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Удзельнічаць у групавой размове"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Дадаць чалавека..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Скапіяваць адрас спасылкі"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Адкрыць у праглядальніку"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Скапіяваць JID / паштовы адрас"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Напісаць ліст"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Скапіяваць адрас спасылкі"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Змяненне рахунка"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Скапіяваць JID / паштовы адрас"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "За_прасіць"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Выкінуць"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Забараніць казанне"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Уладальнік"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Адміністратар"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Удзельнік"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Удзельнік"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Голас"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Пакой:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "паведамленне"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Сымболікі:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Немагчыма адшукаць базу дадзеных"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "Адрас AIM:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -656,28 +657,28 @@ msgstr "Дата"
 msgid "Nickname"
 msgstr "Мянушка"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Паведамленне"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Тэма"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "стварэнне базы журналаў"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -690,28 +691,28 @@ msgstr ""
 "\n"
 "Калі Вы выбралі Так, пачакайце..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Па_чысціць"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Вы"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s а %(time)s сказаў: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -719,7 +720,7 @@ msgstr[0] "Асабістыя звесткі"
 msgstr[1] "Асабістыя звесткі"
 msgstr[2] "Асабістыя звесткі"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -727,7 +728,7 @@ msgstr[0] "Вы сапраўды хочаце выдаліць выбранае
 msgstr[1] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -735,7 +736,7 @@ msgstr[0] "Стандартныя паведамленні стану"
 msgstr[1] "Стандартныя паведамленні стану"
 msgstr[2] "Стандартныя паведамленні стану"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -743,237 +744,242 @@ msgstr[0] "Вы сапраўды хочаце выдаліць выбранае
 msgstr[1] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Імя чалавека: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Агульная"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Група"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "У групе"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Вызначыць MOTD"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ніякі"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Паведамленне аб змене стану %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Паведамленне аб змене стану"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Паведамленне аб змене стану"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Паведамленне аб змене стану"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Захаваць тлумачэнне..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Вызначце назву гэтага паведамлення аб змене стану"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Мае "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Стан"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Назва"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Адправіць _файл"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Захаваць файл як..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Перадача файлаў"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Няправільны файл"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Пакаранне %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Чорны спіс"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Запыт на перадачу файла"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Такой групавой размовы няма."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Вы не злучаны з серверам"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Групавыя размовы"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Групавыя размовы"
@@ -988,7 +994,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Памылка Avahi"
@@ -1017,22 +1023,22 @@ msgstr "Новы рахунак паспяхова створаны"
 msgid "Failed to Configure Group Chat"
 msgstr "Сысці з групавых размоў"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s змяніў мянушку на %s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Вашая мянушка змененая на %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s цяпер %(status)s"
@@ -1157,81 +1163,81 @@ msgstr "Вы сапраўды хочаце сысці з групавой раз
 msgid "If you close this window, you will leave '%s'."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групавой размовы %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "Ад_правіць і закрыць"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Новае паведамленне"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "Ад_правіць і закрыць"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1240,189 +1246,180 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Перадача файлаў"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Памер: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Прыняць"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Адключаны"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Адкрыць дырэкторыю з файлам"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Памылка чытання файла:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Перадача файла спыненая"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Перадача файла скасаваная"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Значка панэлі паведамленняў"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Паказваць толькі ў _галоўным вакне"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Адмысловы рэдактар настаўленняў"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Настаўленні пакоя"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Паказаць нягледжаныя _падзеі"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Пачаць размову"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Транспарты"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Групавыя размовы"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Аўтарызацыя забраная"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
@@ -1432,7 +1429,7 @@ msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлу
 msgid "desynced"
 msgstr "Адмысловы"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1452,7 +1449,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Выйсці"
@@ -1599,8 +1597,8 @@ msgstr "Змяніць назву групы"
 msgid "Please enter a new name"
 msgstr "Стварыць новы допіс"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "_Змяніць імя"
@@ -1619,27 +1617,32 @@ msgstr "Хочаце выдаліць групу %s з кантактнага л
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Сысці з групавых размоў"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1649,22 +1652,22 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1676,24 +1679,24 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1702,12 +1705,12 @@ msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1718,22 +1721,22 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Неактывізаваны"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1741,104 +1744,104 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "Ад_правіць"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Адправіць %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Зрабіць %s і %s мета-кантактамі"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Зрабіць %s і %s мета-кантактамі"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "За_прасіць"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Змяніць _групы"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "Вы_даліць"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "_Змяніць імя"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "Чалавек адлучыўся"
+msgid "Execute command"
+msgstr "_Выканаць загад..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Журнал"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Назіральнікі"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1966,221 +1969,221 @@ msgstr "Прыватныя размовы"
 msgid "Messages"
 msgstr "Паведамленні"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ніякі"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Запыт падпіскі"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Запыт падпіскі"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Адпісацца"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Памылка чытання файла:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Перадача файлаў"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Добра"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запыт на перадачу файла"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Злучэнне"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2188,20 +2191,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Злучэнне"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2401,11 +2404,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Памылка абнаўлення vCard"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы выйшлі з пакоя \"%s\", альбо \"%s\" сышоў."
@@ -2731,28 +2734,23 @@ msgstr ""
 "Аргумент \"%s\" не вызначаны. \n"
 "Увядзіце \"%s help %s\" для падрабязных звестак"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Апісанне: %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Новае прыватнае паведамленне"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2760,50 +2758,50 @@ msgstr[0] "Новае паведамленне ад %(nickname)s"
 msgstr[1] "Новае паведамленне ад %(nickname)s"
 msgstr[2] "Новае паведамленне ад %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Новая групавая размова"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змяніў стан"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s прыйшоў"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s сышоў"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Памылка аўтарызацыі з \"%s\""
@@ -2868,64 +2866,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Паведамляць мне аб людзях, якія: "
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Паведамляць мне аб людзях, якія: "
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "_Паказваць падзею ў галоўным вакне"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Мова правапісу"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2935,15 +2891,15 @@ msgstr ""
 "'sometimes' - паказваць час кожныя print_ichat_every_foo_minutes хвілінаў.\n"
 "'never' - не паказваць час."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Лічыць спалучэнні * / _  мажлівымі знакамі фарматавання."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2952,31 +2908,31 @@ msgstr ""
 "Калі true, не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але * * не "
 "выдаляецца."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr "Знак пасля дапоўненай мянушкі ў групавой размове."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr "Знак пасля вызначанай мянушкі, калі яе згадваюць у групавой размове."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2990,24 +2946,24 @@ msgstr ""
 "дакументацыі для python на функцыю strftime: http://docs.python.org/lib/"
 "module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Знакі, якія друкуюцца ў вокнах размовы перад мянушкай"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Знакі, якія друкуюцца ў вокнах размовы пасля мянушкі"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3015,30 +2971,30 @@ msgid ""
 msgstr ""
 "Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Адпраўляць паведамленне праз Ctrl+Enter, а Enter стварае новы радок "
 "(стандартныя паводзіны Mirabilis ICQ)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Колькі радкоў захоўваць для Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3047,13 +3003,13 @@ msgstr ""
 "Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', "
 "што значыць выкарыстанне Вікі-Слоўніка."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim можа кантралявацца з дапамогай gajim-"
 "remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3062,21 +3018,21 @@ msgstr ""
 "Калі трэба паказваць час не для кожнага паведамлення "
 "(print_time==sometimes), паказваць яго кожныя x хвілінаў."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Пытацца пацверджання закрыцця групавой размовы."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3085,32 +3041,32 @@ msgstr ""
 "Вызначае вузел, якому мы адпраўляем файлы, у выпадку трансляцыі адрасоў / "
 "перанакіравання портаў."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "У стандарце IEC вызначана, што КіБ = 1024 байтаў, КБ = 1000 байтаў."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Нагадваць аб падзеях праз значку прасторы паведамленняў."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Паказваць картку, калі актыўная толькі адна размова?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Паказваць межы картак у вокнах размовы?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Паказваць кнопку закрыцця на картцы?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3119,7 +3075,7 @@ msgstr ""
 "Спіс падзеленых кропкай з коскай слоў, якія трэба фарбаваць у групавых "
 "размовах."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3129,60 +3085,51 @@ msgstr ""
 "Калі true, Gajim сканчвае работу па націску кнопкі X вакна. Гэтае "
 "настаўленне ўлічваецца толькі разам з значкай прасторы паведамленняў."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Калі true, Gajim паказвае значку на кожнай картцы з нечытанымі "
-"паведамленнямі. У залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
 "the contact name in the contact list window."
 msgstr "Калі true, Gajim паказвае стан у галоўным вакне для кожнага чалавека"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
 "contact changes their status (and/or their status message)."
 msgstr "Калі false, не паказваць паведамленні аб змене стану суразмоўцы."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3192,7 +3139,7 @@ msgstr ""
 "вакном (звычайныя паводзіны ў бальшыні кіраўнікоў вокнаў) пры наяўнасці "
 "нягледжаных падзей."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3212,7 +3159,7 @@ msgstr ""
 "адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужытыя толькі "
 "пасля перазапуску праграмы."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3220,32 +3167,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Калі true, клавіша Escape закрывае картку / вакно."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Хавае банер у групавой размове"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Хавае банер у групавой размове"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Схаваць спіс удзельнікаў групавой размовы."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3254,11 +3201,11 @@ msgstr ""
 "У групавой размове не паказваць мянушку, калі папярэдняе паведамленне "
 "напісаў той самы чалавек."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Водступ пры шматмэтавым прызначэнні паведамлення."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3266,7 +3213,7 @@ msgid ""
 msgstr ""
 "Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3275,7 +3222,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3284,7 +3231,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3295,7 +3242,7 @@ msgstr ""
 "Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў "
 "ад Вашага сервера."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3304,92 +3251,84 @@ msgstr ""
 "Калі true, Gajim будзе паказваць у кантактным лісце колькасць падлучаных "
 "людзей і агульную колькасць у радках групаў і рахункаў."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3397,37 +3336,37 @@ msgstr ""
 "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
 "пароляў Gnome Keyring (калі ўсталяваны)."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3436,7 +3375,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3445,7 +3384,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3454,7 +3393,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3463,7 +3402,7 @@ msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3472,28 +3411,32 @@ msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_Змясціць у закладках"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3502,62 +3445,62 @@ msgstr ""
 "Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўленыя ў "
 "опцыях autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3566,17 +3509,17 @@ msgstr ""
 "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
 "выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3584,17 +3527,17 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3603,28 +3546,24 @@ msgstr ""
 "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
 "выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Дадаць асабістае нагадванне для %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3633,41 +3572,41 @@ msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3676,91 +3615,91 @@ msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Сон"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Ежа"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Працую."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Фільм"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Працую"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Працую."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Сышоў"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3770,1133 +3709,1133 @@ msgstr ""
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Да"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Роля чалавека:Няма"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Групавыя размовы"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Групавая размова"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Групавыя размовы"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Роля чалавека:Няма"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Стварэнне групавых размоў абмежаванае."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Новая групавая размова"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Гэта не групавая размова"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Такой групавой размовы няма."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Групавыя размовы"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Няправільны вузел"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cleaning"
 msgstr "Вечар"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cooking"
 msgstr "Піша"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Gardening"
 msgstr "Раніца"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "усе з групы"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "Працую"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 #, fuzzy
 msgid "Dancing"
 msgstr "Вечар"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "Пакаранне %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 #, fuzzy
 msgid "Jogging"
 msgstr "_Далучыцца"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 #, fuzzy
 msgid "Skiing"
 msgstr "Працую"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "Працую"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Grooming"
 msgstr "пакой"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Shaving"
 msgstr "Ежа"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Неактыўны"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Змяненне тэмы"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Hiding"
 msgstr "Пакаранне %s"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Praying"
 msgstr "Ежа"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Thinking"
 msgstr "Працую"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Fishing"
 msgstr "Пакаранне %s"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 #, fuzzy
 msgid "Gaming"
 msgstr "Ежа"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "З_ысці"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Partying"
 msgstr "Ежа"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "Прычына"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Прычына"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 #, fuzzy
 msgid "Shopping"
 msgstr "Сон"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 #, fuzzy
 msgid "Smoking"
 msgstr "Працую"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Ежа"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Гляджу фільм."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "Ежа"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 #, fuzzy
 msgid "On the Phone"
 msgstr "Я на тэлефоне."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Traveling"
 msgstr "Перадача"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Commuting"
 msgstr "Піша"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 #, fuzzy
 msgid "On a Plane"
 msgstr "У сетцы"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "On a Train"
 msgstr "Адкрыць _спасылку"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Walking"
 msgstr "Працую"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 #, fuzzy
 msgid "Coding"
 msgstr "Піша"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "Працую"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 #, fuzzy
 msgid "Aroused"
 msgstr "Прыпынена"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Bored"
 msgstr "Тлусты"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 #, fuzzy
 msgid "Brave"
 msgstr "Мае "
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 #, fuzzy
 msgid "Cautious"
 msgstr "Размовы"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Cold"
 msgstr "Тлусты"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 #, fuzzy
 msgid "Confident"
 msgstr "_Змест"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Contemplative"
 msgstr "Скончаная"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Contented"
 msgstr "_Змест"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 #, fuzzy
 msgid "Creative"
 msgstr "Неактывізаваны"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 #, fuzzy
 msgid "Curious"
 msgstr "спасылка"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 #, fuzzy
 msgid "Dejected"
 msgstr "Выдаліць"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "Disappointed"
 msgstr "Адключана"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "Dismayed"
 msgstr "Адключана"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "Distracted"
 msgstr "Адключана"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 #, fuzzy
 msgid "Excited"
 msgstr "Актывізаваны"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Група"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "Hot"
 msgstr "_Вузел:"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "паведамленне"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Актывізаваны"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Invincible"
 msgstr "Нябачны"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Lonely"
 msgstr "адзін"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Lost"
 msgstr "_Вузел:"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "Mean"
 msgstr "Нямецкая"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Moody"
 msgstr "_Змяніць"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "Offended"
 msgstr "Адключаны"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Proud"
 msgstr "Група"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "адзінаццаць"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 #, fuzzy
 msgid "Sad"
 msgstr "Марнаванне часу"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 #, fuzzy
 msgid "Satisfied"
 msgstr "Апошняя змена:"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Sick"
 msgstr "Мянушка"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Sleepy"
 msgstr "Сон"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Stressed"
 msgstr "Вуліца:"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Surprised"
 msgstr "Падпісаны"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 #, fuzzy
 msgid "Tired"
 msgstr "Час"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 #, fuzzy
 msgid "Undefined"
 msgstr "дзевяць"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "Прадвызначана"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "мора"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Пакаранне %s"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Краіна:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Рахунак"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Апісанне"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Памылка Avahi"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "адзін"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "пакой"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Стан змяніўся."
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Настаўленні пакоя"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Патрэбны пароль"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Шыфраванне адключанае"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Патрэбны пароль"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Шыфраванне дзейнічае"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Памылка аўтарызацыі з \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4958,12 +4897,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Настаўленні пакоя"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4975,222 +4914,192 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Няправільны знак у назве вузла."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Патрэбны адрас сервера."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Няправільны знак у імені карыстальніка."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Няправільны знак у назве рэсурса."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Заняты"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Заняты"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "М_яне няма"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Мяне няма"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Магу размаўляць"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Магу размаўляць"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "Н_е тут"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Сышоў"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Адключаны"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Адключаны"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?чалавек у стане:Невядомы"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?чалавек у стане:Ёсць памылкі"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Ужо ёсць падпіскі:Няма"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Да"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Ад"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Абодва"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Запыт (на падпіску):Няма"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Падпісацца"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роля чалавека:Няма"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Мадэратары"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Мадэратар"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Удзельнікі"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Удзельнік"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Наведвальнікі"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Наведвальнік"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Уладальнік"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Уладальнік"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Адміністратар"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Адміністратар"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Удзельнік"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Удзельнік"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "сочыць за размовай"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "заняты чымсьці іншым"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "піша паведамленне..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "перастаў пісаць"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5198,22 +5107,22 @@ msgstr[0] "Адправіць паведамленне"
 msgstr[1] "Адправіць паведамленне"
 msgstr[2] "Адправіць паведамленне"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "Удзельнічаць у _групавой размове"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Ад"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5221,50 +5130,39 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s з'яўляецца файлам, але павінна быць дырэкторыя"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim сканчвае работу"
 
@@ -5365,85 +5263,85 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "Месца файла"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 #, fuzzy
 msgid "File does not exist"
 msgstr "Такой групавой размовы няма."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Шыфраванне адключанае"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Змяніць звесткі аб стане"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Змяніць стан"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Выставіць тып прысутнасці і апісанне"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Вольны для размовы"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "У сетцы"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Пашыраны рэжым адсутнасці"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Не турбаваць"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Адлучаны - па-за сеткай"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Апісанне прысутнасці:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Стан змяніўся."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Людзі"
@@ -5468,7 +5366,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Рахунак"
 
@@ -5479,7 +5377,7 @@ msgstr "Групавыя размовы"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -5503,7 +5401,7 @@ msgstr "Удзельнічаць у _групавой размове"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Далучыцца"
@@ -5521,17 +5419,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
@@ -5680,7 +5578,7 @@ msgstr "Асабістыя звесткі"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Апісанне"
 
@@ -5888,39 +5786,44 @@ msgstr "Праца"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Пра мяне"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Удзельнічаць у групавой размове"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Хутка буду"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Далучыцца"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Выдаленне рахунка %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5991,6 +5894,7 @@ msgid "Strike"
 msgstr "Мянушка"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Колер"
 
@@ -6004,137 +5908,132 @@ msgstr "_Шрыфт:"
 msgid "Clear formatting"
 msgstr "Асабістыя звесткі"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Выберыце файл..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Забараніць казанне..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "_Пасля мянушкі:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Змяніць м_янушку"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Змяніць _тэму"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Увядзіце новы пароль:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Сысці з групавых размоў"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Адбылася памылка:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Удзельнік"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Выкінуць"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Удзельнік"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Забараніць казанне"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Новая групавая размова"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Апісанне: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Прычына"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Вызначце новую назву групы %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "За_прасіць"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Падзея"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Падзеі"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6233,20 +6132,20 @@ msgid "Add"
 msgstr "Адрас"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "Вы_даліць"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Рэсурс:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Стан"
 
@@ -6256,7 +6155,7 @@ msgid "Client"
 msgstr "Праграма:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Адмысловы</b>"
@@ -6398,38 +6297,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Паказаць _галоўнае вакно"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Аб'яднаць рахункі"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6438,12 +6338,12 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Паказваць _стан у галоўным вакне"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6452,54 +6352,54 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае паведамленні аб зменах стану для "
 "кожнага чалавека ў галоўным вакне і ў групавых размовах"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Упарадкаваць людзей па стане"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Людзі"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "Удзельнічаць у _групавой размове"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Чалавек адлучыўся"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6507,87 +6407,87 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "змест паведамлення"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Паказваць _стан у галоўным вакне"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
 msgstr "Калі false, не паказваць паведамленні аб змене стану суразмоўцы."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Памылка злучэння"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Паказваць кнопку закрыцця на картцы?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6596,65 +6496,68 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Паказваць кнопку закрыцця на картцы?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Апошняе паведамленне: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Размова"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "_Значка панэлі паведамленняў"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Па атрыманні новай падзеі"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6663,63 +6566,63 @@ msgstr ""
 "Gajim будзе паведамляць Вам аб новых падзеях у выплыўным вакне ў правым "
 "верхнім куце экрана"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Візуальныя нагадванні</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Граць _гук"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Кі_раванне..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Файлы Wav"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 #, fuzzy
 msgid "Notifications"
 msgstr "Змяненне рахунка"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Мяне няма"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6727,7 +6630,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6735,109 +6638,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "хвіліны"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "_Адпаведна стану"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Запытацца аб паведамленні змены стану, калі я:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Злучыцца"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "З_ысці"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Стандартныя паведамленні стану"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Уключыць"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Паведамленне аб змене стану"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Паведамленні аб змене стану</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Тэма"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Тэма"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Настаўленні колераў і шрыфтаў"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Прадвызначаны набор _значак стану:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Ужыць _значкі транспартаў"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6847,119 +6750,129 @@ msgstr ""
 "пратаколаў. (напр., чалавек з MSN будзе мець адпаведныя значкі злучанасці, "
 "адсутнасці, занятасці і г.д. для MSN-карыстальнікаў)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 #, fuzzy
 msgid "Style"
 msgstr "Марнаванне часу"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Здольнасці сервера"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Стандартныя паведамленні стану"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Прыватная размова"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Злучэнне"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Сервер:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Кіраванне..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Рознае</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Адкрыць..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Адмысловы рэдактар настаўленняў"
@@ -7150,12 +7063,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Увядзіце новы пароль:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Адмысловыя дзеянні"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Адмысловы вузел / порт"
@@ -7242,7 +7155,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Злучыцца"
@@ -7256,7 +7169,7 @@ msgstr "Стварыць новы допіс"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7284,8 +7197,8 @@ msgstr "_Вярнуць звычайныя колеры"
 msgid "Resets value to default"
 msgstr "_Вярнуць звычайныя колеры"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Назва вузла: "
@@ -7329,7 +7242,7 @@ msgstr "Няправільнае імя карыстальніка"
 msgid "Proxy Host"
 msgstr "Проксі:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Тып"
 
@@ -7343,8 +7256,7 @@ msgstr "_Пратакол:"
 msgid "Copy info to clipboard"
 msgstr "_Скапіяваць адрас спасылкі"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 #, fuzzy
 msgid "Features"
 msgstr "Здольнасці сервера"
@@ -7530,6 +7442,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "З_мяніць паведамленне аб стане"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -7608,8 +7525,8 @@ msgstr "Марнаванне часу"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7801,80 +7718,106 @@ msgstr "Памылка злучэння"
 msgid "_Name"
 msgstr "_Імя:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Проксі:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Пачаць размову"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Сысці з групавых размоў"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Кіраўнік журналаў"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Памылка злучэння"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Уласцівасці"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Выйсці"
+msgid "_Accounts"
+msgstr "Рахункі"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Выгляд"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Паказаць _адлучаных людзей"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Паказаць _транспарты"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Кансоль XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Перадача файлаў"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Даведка"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "У сетцы"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "У сетцы"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Здольнасці сервера"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Пра мяне"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7889,6 +7832,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Сысці з групавых размоў"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8172,60 +8120,68 @@ msgstr "Чалавек адлучыўся"
 msgid "Create new group chat"
 msgstr "Сысці з групавых размоў"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Уласцівасці"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Перадача файлаў"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "паведамленне стану"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Паказаць _кансоль XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Змяніць правіла</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Людзі"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Асабістыя звесткі"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Людзі"
@@ -8301,12 +8257,16 @@ msgstr "Запоўніце форму."
 msgid "Group Chat Configuration"
 msgstr "Запрашэнне ў групавую размову"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Кансоль XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Пачаць размову"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Фільтар:"
@@ -8353,11 +8313,6 @@ msgstr "Паказаць нягледжаныя _падзеі"
 msgid "Mute Sounds"
 msgstr "Адключыць гукі"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Уласцівасці"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8678,124 +8633,124 @@ msgstr "Перадача файла %(filename)s ад %(name)s спыненая.
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Роля чалавека:Няма"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Групавыя размовы"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Роля чалавека:Няма"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Групавыя размовы"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Роля чалавека:Няма"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Для гэтай групавой размовы не вызначаная тэма размовы"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Групавыя размовы"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Групавыя размовы"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Групавыя размовы"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Роля чалавека:Няма"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Запрашэнне ў групавую размову"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Вы не злучаны з серверам"
@@ -8824,7 +8779,7 @@ msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Атрымальнік: "
 
@@ -8976,7 +8931,7 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
@@ -8991,7 +8946,7 @@ msgid "Change"
 msgstr "Змяніць м_янушку"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Хутка буду"
@@ -9022,11 +8977,12 @@ msgid "Password Change Failed"
 msgstr "Патрабуецца пароль"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Адбылася памылка ў часе стварэння рахунка"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Змяніць пароль"
 
@@ -9061,41 +9017,36 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Злучэнне"
+msgid "Start / Join Chat"
+msgstr "Пачаць размову"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Дадаць чалавека..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s не знойдзены"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Гэты сервіс яшчэ не адказаў на запыт падрабязных звестак"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9104,34 +9055,34 @@ msgstr ""
 "Гэты сервіс не дае падрабязных звестак.\n"
 "Хутчэй за ўсё, гэты сервіс састарэлы ці зламаны"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Іншыя"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Групавая размова"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Пошук сервісаў"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9139,145 +9090,145 @@ msgstr ""
 "Па вызначаным адрасе няма сервісаў, альбо яны не адказваюць на запыты. "
 "Праверце адрас і паспрабуйце зноў."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сервіс"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Прагляд %s для рахунка %s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Праглядзець"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў, якія можна праглядзець."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Загады: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "П_ошук"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Змяніць"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Пошук у %d / %d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Карыстальнікі"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Падпісаны"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 #, fuzzy
 msgid "Node"
 msgstr "Ніякі"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Новы допіс"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ад_правіць асобнае паведамленне"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "тэма"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Немагчыма адправіць пусты файл"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
@@ -9324,91 +9275,75 @@ msgstr "Зарэгістравацца на %s"
 msgid "Registration failed"
 msgstr "Памылка злучэння"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Слоўніка для мовы %s няма"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
-"іншую мову праз опцыю speller_language."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "для рахунка %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Нумар GG:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Запрашэнне ў групавую размову"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
@@ -9423,6 +9358,11 @@ msgstr "Нумар GG:"
 msgid "ICQ Number"
 msgstr "Нумар ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Дадаць чалавека..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9478,7 +9418,7 @@ msgstr "Памылка дадання сервіса. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9640,43 +9580,63 @@ msgstr "Чалавек адлучыўся"
 msgid "Contact Connected Background "
 msgstr "Чалавек далучыўся"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Паведамленне аб змене стану"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Паведамленне аб змене стану"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Паведамленне аб змене стану"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Паведамленне аб змене стану"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Актыўны"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Памылка злучэння"
@@ -9700,10 +9660,9 @@ msgid "Error: %s"
 msgstr "Памылка: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr ""
 
@@ -9717,48 +9676,48 @@ msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Усе файлы"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Вечар"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Кіраванне профілямі проксі"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Проксі:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Адпаведна стану"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Адключаны"
@@ -9779,7 +9738,7 @@ msgstr "Рахунак"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Новы рахунак паспяхова створаны"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9811,60 +9770,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Паказаць _адлучаных людзей"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Злучэнне"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "%d нечытанае паведамленне"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Jabber-праграма для GTK+"
@@ -9922,130 +9886,130 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Выберыце файл..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Выберыце малюнак"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Усе файлы"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Усе файлы"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Адправіць _файл"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Малюнкі"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Выберыце малюнак"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Усе файлы"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Захаваць файл як..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s гэтай групавой размовы"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 #, fuzzy
 msgid "Connected"
 msgstr "Злучэнне"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 #, fuzzy
 msgid "Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Файл: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Сцягнуць"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Загрузіць"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Перадача файла спыненая"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 #, fuzzy
 msgid "Description: "
 msgstr "Апісанне: %s"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Прыпыненая"
@@ -10054,7 +10018,7 @@ msgstr "?transfer status:Прыпыненая"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Няправільны файл"
@@ -10112,26 +10076,26 @@ msgstr "Фарбаванае паведамленне ў групавой раз
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Патрабуецца пароль"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Ніякі"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Скасаваць"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10150,11 +10114,6 @@ msgstr "выкарыстоўвае рахунак %s"
 msgid "Hide _Contact List"
 msgstr "Людзі"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Паказаць _адлучаных людзей"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
@@ -10205,36 +10164,31 @@ msgstr ""
 "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
 "абнавіць пазней."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Настаўленні"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Настаўленні"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Вы не злучаны з серверам"
+msgid "Archiving Preferences Error"
+msgstr "_Настаўленні"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Вы атрымалі новае паведамленне:"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Настаўленні"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Актывізаваны"
@@ -10283,172 +10237,172 @@ msgstr "?Запыт (на падпіску):Няма"
 msgid "?password:Hidden"
 msgstr "Пароль:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Настаўленні"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Паведамленне аб аўтаматычнай недаступнасці"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Злучэнне"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "_Голас"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Паведамленне аб аўтаматычнай недаступнасці"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Змяненне рахунка"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Патрабуецца пароль"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Захаваць пароль"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Кіраўнік журналаў"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Настаўленні"
@@ -10494,7 +10448,7 @@ msgstr "Няправільная назва спіса"
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Людзі"
@@ -10522,7 +10476,7 @@ msgstr "_Скончыць"
 msgid "Commands"
 msgstr "Загады: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10595,119 +10549,133 @@ msgstr "Запыт увагі ад %s"
 msgid "Loading"
 msgstr "Піша"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Злучэнне"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Увайсці"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Выдаленне рахунка %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Пстрыкніце, каб змяніць пароль рахунка"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Злучэнне"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Ваш сервер не падтрымлівае Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Ваш сервер не падтрымлівае Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Памылка злучэння"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Дадаць чалавека..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Стварыць новы допіс"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Адмысловыя дзеянні"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Забарона казання для %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Настаўленні пакоя"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Выдаленне рахунка %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Зарэгістравацца на %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Рахунак"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Рахункі"
@@ -10750,249 +10718,253 @@ msgstr "Пошук"
 msgid "No results found"
 msgstr "%s не знойдзены"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Перадалучыцца?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Перадалучыцца?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Няправільная назва рахунка"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Няправільная назва рахунка"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Людзі"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Няправільнае імя карыстальніка"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Злучацца па старце Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Захоўваць _журналы размоў з усімі людзьмі"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Усе станы"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Ужыць проксі для перадачы файлаў"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " ад %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Людзі"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Прыяры_тэт:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Няма злучэння"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Імя:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Прозвішча:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Новы ліст"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Адпаведна стану"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Уключыць"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Злучэнне"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Няправільнае імя карыстальніка"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Захаваць пароль"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Памылка злучэння"
@@ -11047,19 +11019,19 @@ msgstr[0] "Выдаліць чалавека з спіса"
 msgstr[1] "Выдаліць чалавека з спіса"
 msgstr[2] "Выдаліць чалавека з спіса"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11071,21 +11043,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Змясціць у закладках"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Месца файла"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11142,127 +11114,232 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Паказаць нягледжаныя _падзеі"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Здольнасці сервера"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Людзі"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Групавыя размовы"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Нядаўна:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Памылка злучэння"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Злучэнне"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Слоўніка для мовы %s няма"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
+#~ "іншую мову праз опцыю speller_language."
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "Чалавек адлучыўся"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Выйсці"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Паказаць _адлучаных людзей"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Дадаць чалавека..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Людзі"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Сысці з групавых размоў"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Новая групавая размова"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Калі true, Gajim паказвае значку на кожнай картцы з нечытанымі "
+#~ "паведамленнямі. У залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Няправільны знак у назве вузла."
+
+#~ msgid "Server address required."
+#~ msgstr "Патрэбны адрас сервера."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Няправільны знак у імені карыстальніка."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Няправільны знак у назве рэсурса."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Паведамляць мне аб людзях, якія: "
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Паведамляць мне аб людзях, якія: "
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "_Паказваць падзею ў галоўным вакне"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Падзея"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Падзеі"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Вы не злучаны з серверам"
+
+#, fuzzy
 #~ msgid "Resource Conflict"
 #~ msgstr "Канфлікт імёнаў карыстальнікаў"
 
@@ -11828,9 +11905,6 @@ msgstr "Памылка злучэння"
 #~ msgid "_Send Private Message"
 #~ msgstr "Ад_правіць прыватнае паведамленне"
 
-#~ msgid "Send _File"
-#~ msgstr "Адправіць _файл"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Удзельнікі"
@@ -13729,10 +13803,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Марнаванне часу"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Памылка злучэння"
-
 #~ msgid "cyan"
 #~ msgstr "cyan"
 
@@ -13875,10 +13945,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Network-Watcher"
 #~ msgstr "Кіраўнік журналаў"
 
-#, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Кіраўнік журналаў"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -14163,9 +14229,6 @@ msgstr "Памылка злучэння"
 #~ "Калі порт адпраўкі паведамленняў не прыдатны для Вас, выберыце іншы.\n"
 #~ "Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Аб'яднаць рахункі"
-
 #, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
diff --git a/po/be@latin.po b/po/be@latin.po
index 2b2d993ee..929788289 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:41+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian Latin <i18n@mova.org>\n"
@@ -19,77 +19,83 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Konty"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Abiary vyjavu"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Niama złučeńnia z serveram"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Bolš nie pytajsia"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Śpis pryvatnaści"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Blakavańnie %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Praciahni"
 
@@ -155,232 +161,224 @@ msgstr ""
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Vyšli _asobnaje paviedamleńnie"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Vykanaj zahad..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transparty"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "Źmiani _nazvu"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Vydal"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Vyšli _fajł"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Zapišy fajł jak..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Zapišy fajł jak..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Apošni status: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Kantakty"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Dadaj kantakt..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Прыватная размова"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Žurnał razmoŭ"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Adklučana"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Usie statusy"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Kantakty"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Pakiń pakoji"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Pakiń pakoji"
+msgid "Rename…"
+msgstr "Źmiani _nazvu"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Źmiani _temu"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Pakiń pakoji"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Abiary vyjavu"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Novaja hrupavaja razmova"
+msgid "Configure…"
+msgstr "_Praciahni"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Apisańnie: %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Šablony paviedamleńniaŭ statusu:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Źmiani _mianušku"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Daj hołas"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Vykanaj zahad..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -388,270 +386,273 @@ msgstr[0] "%i dzion tamu"
 msgstr[1] "%i dzion tamu"
 msgstr[2] "%i dzion tamu"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Uvod paviedamleńnia"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Usie statusy"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Dadaj kantakt..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "fajł"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Vyšli _asobnaje paviedamleńnie"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Šukaj servisy"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Pašyranyja"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nałady"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Stvary zakładku dla hetaja pakoju"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Administratar"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Dašli paviedamleńnie servera"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Vyznač MOTD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Aktualizuj MOTD"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Vydal MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Dadaj kantakt..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Madyfikuj kont"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Madyfikuj kont"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Konty"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "S_kapijuj JID/Email"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Dałučysia da pakoju"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Dadaj kantakt..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "S_kapijuj adras spasyłki"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Adčyni spasyłku ŭ hartačy"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "S_kapijuj JID/Email"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Adčyni paštovuju prahramu"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "S_kapijuj adras spasyłki"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Madyfikacyja kontu"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "S_kapijuj JID/Email"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "_Zaprasi"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Vypchni"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "Za_blakuj"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Ułaśnik"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Administratar"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Udzielnik"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Udzielnik"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Daj hołas"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Pakoj:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "paviedamleńnie"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Smajliki:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Niemahčyma znajści bazu žurnałaŭ razmoŭ"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Takoha pakoju niama."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "Adras AIM:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -659,28 +660,28 @@ msgstr "Data"
 msgid "Nickname"
 msgstr "Mianuška"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Paviedamleńnie"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -693,28 +694,28 @@ msgstr ""
 "\n"
 "Kali ty abraŭ \"Tak\", pačakaj..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Pry_biarysia"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Ty"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s a %(time)s napisaŭ: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Vydal"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -722,7 +723,7 @@ msgstr[0] "Źviestki ab kantakcie"
 msgstr[1] "Źviestki ab kantakcie"
 msgstr[2] "Źviestki ab kantakcie"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -730,7 +731,7 @@ msgstr[0] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 msgstr[1] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 msgstr[2] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -738,7 +739,7 @@ msgstr[0] "Standartnyja šablony paviedamleńniaŭ statusu"
 msgstr[1] "Standartnyja šablony paviedamleńniaŭ statusu"
 msgstr[2] "Standartnyja šablony paviedamleńniaŭ statusu"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -746,237 +747,242 @@ msgstr[0] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 msgstr[1] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 msgstr[2] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazva kantaktu: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Ahulnaja"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Hrupa"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "U hrupie"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Vyznač MOTD"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Nijaki"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Paviedamleńnie statusu %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Paviedamleńnie statusu"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Paviedamleńnie statusu"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Paviedamleńnie statusu"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Zachavaj jak šablon..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Kali łaska, uviadzi nazvu dla hetaha paviedamleńnia statusu"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Nie razmaŭlaju "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nazva"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Vyšli _fajł"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Zapišy fajł jak..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Niapravilny fajł"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Vypichvajecca %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Takoha pakoju niama."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Pakoji"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Pakoji"
@@ -991,7 +997,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Pamyłka Avahi"
@@ -1020,22 +1026,22 @@ msgstr "Aŭtaryzacyja anulavanaja"
 msgid "Failed to Configure Group Chat"
 msgstr "Pakiń pakoji"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s ciapier viadomy jak %s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s maje ciapier status %(status)s"
@@ -1160,81 +1166,81 @@ msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Kali začyniš hetaje akno, adłučyśsia ad pakoju."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pakoju %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Dašli i začyni"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Novaje paviedamleńnie"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Dašli i začyni"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1243,189 +1249,180 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Pamier: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Dazvol"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Adł_učany"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Adčyni kataloh z fajłam"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Pieradača fajłu anulavana"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "NIemahčyma złučycca ź inšym bokam."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Redaktar dadatkovych naładaŭ"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Pačni razmovu"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transparty"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Pakoji"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Kali \"%s\" zadavolić tvoj zapyt, ty zmožaš bačyć jahony status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ciapier \"%s\" budzie zaŭsiody bačyć ciabie jak adłučanaha."
@@ -1435,7 +1432,7 @@ msgstr "Ciapier \"%s\" budzie zaŭsiody bačyć ciabie jak adłučanaha."
 msgid "desynced"
 msgstr "Pašyranyja"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1455,7 +1452,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Skonč pracu"
@@ -1606,8 +1604,8 @@ msgstr "Źmiani nazvu hrupy"
 msgid "Please enter a new name"
 msgstr "Stvary novy zapis"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "_Źmiani nazvu"
@@ -1626,27 +1624,32 @@ msgstr "Chočaš vydalić hrupu %s sa śpisu kantaktaŭ?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Vydal taksama ŭsie kantakty z hetaj hrupy sa śpisu kantaktaŭ"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Pakiń pakoji"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Chočaš vydalić hrupu %s sa śpisu kantaktaŭ?"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1656,22 +1659,22 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Ja chaču, kab hety kantakt moh bačyć moj status paśla vydaleńnia"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1683,24 +1686,24 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Treba stvaryć kont, kab razmaŭlać ź inšymi kantaktami."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1709,12 +1712,12 @@ msgstr ""
 "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ. Tamu hetyja źviestki "
 "nia buduć dastupnyja pry nastupnym złučeńni."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1725,22 +1728,22 @@ msgstr ""
 "Zvyčajna hetaja mažlivaść vykarystoŭvajecca, kali adzin čałaviek "
 "karystajecca niekalkimi kontami Jabber albo niekalkimi kontami z transpartaŭ."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Niadziejny"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1748,104 +1751,104 @@ msgstr[0] "%s choča dasłać tabie fajł:"
 msgstr[1] "%s choča dasłać tabie fajł:"
 msgstr[2] "%s choča dasłać tabie fajł:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Vyšli"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Dašli %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Zrabi z %s i %s metakantakt"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Zrabi z %s i %s metakantakt"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Źmiani _hrupy"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Vydal"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "_Źmiani nazvu"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "Kantakt adłučyŭsia"
+msgid "Execute command"
+msgstr "_Vykanaj zahad..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Naziralniki"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1975,222 +1978,222 @@ msgstr "Pryvatnyja razmovy"
 msgid "Messages"
 msgstr "Paviedamleńni"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Prymaješ hety zapyt?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Prymaješ hety zapyt?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Nijaki"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zapyt aŭtaryzacyi"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr ""
 "Kantakt \"%s\" aŭtaryzavaŭ ciabie, i ciapier ty možaš bačyć jaho status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Zapyt aŭtaryzacyi"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Vyznač parol GPG dla kontu %s."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Fajł %(filename)s paśpiachova dasłany da %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Tak"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Złučeńnie"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2198,20 +2201,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Dałučajusia"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2411,11 +2414,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Pamyłka publikacyi vCard"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Pamyłka dasyłańnia pryvatnaha paviedamleńnia"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ciabie niama ŭ pakoji \"%s\", albo \"%s\" pakinuŭ jaho."
@@ -2744,28 +2747,23 @@ msgstr ""
 "Arhument \"%s\" nie akreśleny. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jość kataloham, ale musiŭ być fajł"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Apisańnie: %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2773,50 +2771,50 @@ msgstr[0] "Novaje paviedamleńnie ad %(nickname)s"
 msgstr[1] "Novaje paviedamleńnie ad %(nickname)s"
 msgstr[2] "Novaje paviedamleńnie ad %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Novaja hrupavaja razmova"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s źmianiŭ status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s dałučyŭsia"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s adłučyŭsia"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
@@ -2883,64 +2881,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Mova pravierki pravapisu"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2951,15 +2907,15 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nie pakazvaj času."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znakaŭ * / _  jak znaki farmatavańnia."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2968,7 +2924,7 @@ msgstr ""
 "Kali maje vartaść True, nie vydalaj */_ . Takim čynam *abc* budzie tłustym, "
 "ale i znaki * * nia vydalacca."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2976,7 +2932,7 @@ msgid ""
 msgstr ""
 "Znak, jaki dadajecca paśla mianuški pry dapaŭnieńni (klavišaj TAB) u pakoji."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2985,17 +2941,17 @@ msgstr ""
 "Znak, jaki dadajecca paśla mianuški, kali akreślenaja mianuška ŭžyvajecca ŭ "
 "movie inšaha ŭdzielnika pakoju."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3008,24 +2964,24 @@ msgstr ""
 "\". Hladzi padrabiaznyja źviestki ŭ dakumentacyi dla Pythonu pa funkcyi "
 "strftime: http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Znaki, što pakazvajucca ŭ razmovie pierad mianuškaj"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Znaki, što pakazvajucca ŭ razmovie paśla mianuški"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3033,30 +2989,30 @@ msgid ""
 msgstr ""
 "Kolki radkoŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym aknie."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Dasyłaj paviedamleńnie praz Ctrl+Enter, a Enteram stvaraj novy radok "
 "(zmoŭčanyja pavodziny Mirabilis ICQ)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Kolki radkoŭ zachoŭvać dla Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3065,12 +3021,12 @@ msgstr ""
 "Albo specyjalny adrasm jaki ŭtrymlivaje %s, dzie %s jość słovam/vyrazam, "
 "albo radok 'WIKTIONARY', što aznačaje vykarystańnie Wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajimam možna kiravać praz gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3079,21 +3035,21 @@ msgstr ""
 "Kali čas pakazvajecca nie dla kožnaha paviedamleńnia "
 "(print_time==sometimes), pakazvaj jaho kožnyja x chvilinaŭ."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3102,32 +3058,32 @@ msgstr ""
 "Nadpisvaje host, jaki vysyłajecca dla Pieradačy fajłaŭ, u vypadku tranślacyi "
 "adrasoŭ/pieranakiravańnia partoŭ."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standart IEC vyznačaje, što KiB = 1024 bajtaŭ, KB = 1000 bajtaŭ."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Nahadvaj ab padziejach ikonaj pola nahadvańnia."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Pakazvać kartku, kali dziejnaja tolki adna razmova?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Pakazvać padzieł kartak u voknach razmovy?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Pakazvać knopki začynieńnia na kartkach?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3136,7 +3092,7 @@ msgstr ""
 "Śpis padzielenych kropkaj z koskaj słovaŭ, jakija treba padśviatlać u "
 "pakojach."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3147,23 +3103,13 @@ msgstr ""
 "X Kiraŭnika voknaŭ. Hetaja nałada dziejničaje tolki ź dziejnaj ikonaj pola "
 "nahadvańnia."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Kali opcyja maje vartaść True, Gajim pakazvaje ikonu na kožnaj kartcy ź "
-"niečytanymi paviedamleńniami. U zaležnaści ad matyvu, hetaja ikona moža być "
-"animavanaj."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3172,12 +3118,12 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim pakazvaje status kožnaha kantaktu, kali "
 "jon nie pusty, dla kožnaha elementu śpisu kantaktaŭ."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3186,26 +3132,26 @@ msgstr ""
 "Kali opcyja maje vartaść False, Gajim nie budzie pakazvać radki stanu, kali "
 "surazmoŭca źmianiaje status i/ci paviedamleńnie statusu."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Nie pakazvaj śpis kantaktaŭ na paneli zadańniaŭ."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3215,7 +3161,7 @@ msgstr ""
 "albo paźniejšaj, mirhaj aknom (zmoŭčanyja pavodziny akna ŭ bolšaści "
 "Kiraŭnikoŭ voknaŭ) pry najaŭnaści niečytanych paviedamleńniaŭ."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3235,7 +3181,7 @@ msgstr ""
 "pakazvajucca ŭ asobnych voknach. Zvažaj, što kab ubačyć źmieny, treba "
 "ŭruchomić Gajima nanoŭ."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3243,34 +3189,34 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Kali opcyja maje vartaść True, nacisk klavišy Escape začyniaje kartku/akno."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Chavaje baner u aknie pakoju"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Chavaje baner u aknie pakoju"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Chavaje śpis naviednikaŭ pakoju."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3279,11 +3225,11 @@ msgstr ""
 "U pakoji pakazvaj mianušku pierad paviedamleńniem, tolki kali jaho napisała "
 "nia taja asoba, što napisała papiaredniaje paviedamleńnie."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Vodstup pry šmatmetavym pryznačeńni paviedamleńnia."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3292,7 +3238,7 @@ msgstr ""
 "Ctrl-Tab pierachodzić na nastupnuju kartku, kali na dziejnaj niama "
 "niečytanych paviedamleńniaŭ."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3301,7 +3247,7 @@ msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3310,7 +3256,7 @@ msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3321,7 +3267,7 @@ msgstr ""
 "madyfikacyi kontu. UHAVA: kali ty dałučajeśsia z admoŭnym pryjarytetam, to "
 "nia budzieš atrymvać paviedamleńniaŭ z servera."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3330,92 +3276,84 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie pakazvać kolkaść dałučanych "
 "kantaktaŭ i ahulnuju kolkaść kantaktaŭ u radkach kontaŭ i hrupaŭ."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3423,37 +3361,37 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
 "Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3462,7 +3400,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3471,7 +3409,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3480,7 +3418,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3489,7 +3427,7 @@ msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3498,28 +3436,32 @@ msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_Stvary zakładku dla hetaja pakoju"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3528,23 +3470,23 @@ msgstr ""
 "Pryjarytet budzie aŭtamatyčna źmianiacca zhodna tvajmu statusu. Pryjarytety "
 "akreślivajucca ŭ opcyjach autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3552,39 +3494,39 @@ msgid ""
 msgstr ""
 "Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3593,17 +3535,17 @@ msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
 "adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3611,17 +3553,17 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Kali łaska, zapoŭni źviestki ab kantakcie, jaki chočaš dadać"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3630,28 +3572,24 @@ msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
 "adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3660,41 +3598,41 @@ msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3703,91 +3641,91 @@ msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Splu"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaŭ."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Ja pracuju."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Pracuju"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaŭlaju."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3796,1133 +3734,1133 @@ msgstr ""
 "Hukm jaki treba hrać, kali paviedamleńnie ŭ pakoji ŭtrymlivaje adno sa "
 "słovaŭ, akreślenych u opcyi muc_highlight_words, albo tvaju mianušku."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Huk, jaki treba hrać pry atrymańni novaha hrupavoha paviedamleńnia."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Da"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Pakoji"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Групавая размова"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Pakoji"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Stvareńnie pakojaŭ abmiežavanaje."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Novaja hrupavaja razmova"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Niemahčyma znajści servis"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Heta nie pakoj"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Kont Local užo isnuje."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Takoha pakoju niama."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Pakoji"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Niapravilny host"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cleaning"
 msgstr "Viečar"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cooking"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Gardening"
 msgstr "Ranica"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "pavodle hrupy"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 #, fuzzy
 msgid "Dancing"
 msgstr "Viečar"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "Vypichvajecca %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 #, fuzzy
 msgid "Jogging"
 msgstr "_Dałučysia"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 #, fuzzy
 msgid "Skiing"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Grooming"
 msgstr "pakoj"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Shaving"
 msgstr "Jem"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Pasiŭny"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Źmianiajecca tema"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Hiding"
 msgstr "Vypichvajecca %s"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Praying"
 msgstr "Jem"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Thinking"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Fishing"
 msgstr "Vypichvajecca %s"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 #, fuzzy
 msgid "Gaming"
 msgstr "Jem"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "_Adłučajusia"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Partying"
 msgstr "Jem"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "Pryčyna"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Pryčyna"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 #, fuzzy
 msgid "Shopping"
 msgstr "Splu"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 #, fuzzy
 msgid "Smoking"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Jem"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Hladžu film."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "Jem"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Traveling"
 msgstr "Pieradajecca"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Commuting"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 #, fuzzy
 msgid "On a Plane"
 msgstr "Dałučany"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "On a Train"
 msgstr "Adčyni jak _spasyłku"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Walking"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 #, fuzzy
 msgid "Coding"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 #, fuzzy
 msgid "Aroused"
 msgstr "Prypynienaja"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Bored"
 msgstr "Tłusty"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 #, fuzzy
 msgid "Brave"
 msgstr "Nie razmaŭlaju "
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 #, fuzzy
 msgid "Cautious"
 msgstr "Razmovy"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Cold"
 msgstr "Tłusty"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 #, fuzzy
 msgid "Confident"
 msgstr "_Źmiest"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Contemplative"
 msgstr "Zavieršana"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Contented"
 msgstr "_Źmiest"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 #, fuzzy
 msgid "Creative"
 msgstr "Niadziejny"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 #, fuzzy
 msgid "Dejected"
 msgstr "Vydal"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "Disappointed"
 msgstr "Adklučana"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "Dismayed"
 msgstr "Adklučana"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "Distracted"
 msgstr "Adklučana"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 #, fuzzy
 msgid "Excited"
 msgstr "Dziejny"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Hrupa"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "paviedamleńnie"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Dziejny"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Invincible"
 msgstr "Niabačny"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Lonely"
 msgstr "pieršaja"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "Mean"
 msgstr "Niamieckaja"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Moody"
 msgstr "_Madyfikuj"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "Offended"
 msgstr "Adłučany"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Proud"
 msgstr "Hrupa"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "adzinaccataja"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 #, fuzzy
 msgid "Sad"
 msgstr "Zatrymana"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 #, fuzzy
 msgid "Satisfied"
 msgstr "Apošniaja źmiena:"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Sick"
 msgstr "Mianuška"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Sleepy"
 msgstr "Splu"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Stressed"
 msgstr "Vulica:"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Surprised"
 msgstr "Aŭtaryzavany"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 #, fuzzy
 msgid "Tired"
 msgstr "Čas"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 #, fuzzy
 msgid "Undefined"
 msgstr "dziaviataja"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "Zmoŭčany"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "marski"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Vypichvajecca %s"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Krajina:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Kont"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Apisańnie"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Pamyłka Avahi"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "pieršaja"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "pakoj"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Status źmianiŭsia."
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Musiš vyznačyć parol"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Musiš vyznačyć parol"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Šyfravańnie ŭklučanaje"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4984,12 +4922,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -5001,222 +4939,192 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Niapravilny znak u naźvie hostu."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Patrabujecca adras servera."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Niapravilny znak u imiani karystalnika."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Niapravilny znak u naźvie krynicy."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Zaniaty"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Niedastupny"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Niedastupny"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Achvotna parazmaŭlaju"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Dałučajusia"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Adyjšoŭ"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Adyjšoŭ"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "Adł_učany"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Adłučany"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?kantakt maje status:Nieviadomy"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?kantakt maje status:Jość pamyłki"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Da"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Ad"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Zapyt (aŭtaryzacyi):Niama"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Aŭtaryzuj"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Maderatary"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Maderatar"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Udzielniki"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Udzielnik"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Naviedniki"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Naviednik"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Ułaśnik"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Ułaśnik"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administratar"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administratar"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Udzielnik"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Udzielnik"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "sočyć za razmovaj"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "robić štości inšaje"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piša paviedamleńnie..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "pierastaŭ pisać"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5224,22 +5132,22 @@ msgstr[0] "Dašli paviedamleńnie"
 msgstr[1] "Dašli paviedamleńnie"
 msgstr[2] "Dašli paviedamleńnie"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "Dałučysia da _pakoju"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Ad"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5247,50 +5155,39 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jość fajłam, ale musiŭ być kataloh"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim zaviaršaje vykanańnie"
 
@@ -5394,85 +5291,85 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "Ściežka da fajłu"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 #, fuzzy
 msgid "File does not exist"
 msgstr "Takoha pakoju niama."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Šyfravańnie adklučanaje"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Źmiani infarmacyju statusu"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Źmiani status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Akreśli typ bačnaści i apisańnie"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Dałučany"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Adyjšoŭ"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Nie turbavać"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Niabačny - adłučany"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Apisańnie statusu:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Status źmianiŭsia."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kantakty"
@@ -5497,7 +5394,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Kont"
 
@@ -5508,7 +5405,7 @@ msgstr "Pakoji"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Parol:"
@@ -5532,7 +5429,7 @@ msgstr "Dałučysia da _pakoju"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Dałučysia"
@@ -5550,17 +5447,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -5709,7 +5606,7 @@ msgstr "Źviestki ab kantakcie"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Apisańnie"
 
@@ -5917,39 +5814,44 @@ msgstr "Praca"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Pra siabie"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Dałučysia da pakoju"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Chutka viarnusia"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Dałučysia"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Vydalajecca kont %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -6020,6 +5922,7 @@ msgid "Strike"
 msgstr "Mianuška"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Koler"
 
@@ -6033,137 +5936,132 @@ msgstr "_Šryft:"
 msgid "Clear formatting"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Blakavańnie..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "_Пасля мянушкі:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Źmiani _mianušku"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Źmiani _temu"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Uviadzi novy parol:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Pakiń pakoji"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Adbyłasia pamyłka:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Udzielnik"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Vypchni"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Udzielnik"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "Za_blakuj"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Apisańnie: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Pryčyna"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "_Zaprasi"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Padzieja"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Padzieji"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6262,20 +6160,20 @@ msgid "Add"
 msgstr "Adras"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Vydal"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Krynica:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6285,7 +6183,7 @@ msgid "Client"
 msgstr "Prahrama:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Asablivy</b>"
@@ -6427,38 +6325,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Pakažy _śpis kantaktaŭ"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Źlej konty ŭ adno"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6467,12 +6366,12 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6481,54 +6380,54 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać paviedamleńni statusu "
 "kantaktaŭ u śpisie kantaktaŭ i ŭ pakojach"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Paradkuj kantakty pa statusie"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Kantakty"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "Dałučysia da _pakoju"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6536,29 +6435,29 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "źmiest paviedamleńnia"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6567,58 +6466,58 @@ msgstr ""
 "Kali opcyja maje vartaść False, Gajim nie budzie pakazvać radki stanu, kali "
 "surazmoŭca źmianiaje status i/ci paviedamleńnie statusu."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Pakazvać knopki začynieńnia na kartkach?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6627,67 +6526,70 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Pakazvać knopki začynieńnia na kartkach?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Apošni status: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Razmova"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Kali ŭčyniajecca novaja padzieja"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Pakazvaj vypłyŭnyja vokny i nahadvańni, kali ja ŭ stanie _Adyjšoŭ/"
 "Niedastupny/Zaniaty/Niabačny"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Pakazvaj vypłyŭnyja vokny i nahadvańni, kali ja ŭ stanie _Adyjšoŭ/"
 "Niedastupny/Zaniaty/Niabačny"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6696,63 +6598,63 @@ msgstr ""
 "Gajim budzie nahadvać ab novych padziejach u vypłyŭnym aknie ŭ pravym nižnim "
 "kucie ekranu"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Vizualnyja nahadvańni</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "_Ahučvaj"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "_Kiruj..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 #, fuzzy
 msgid "Notifications"
 msgstr "Madyfikacyja kontu"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Niedastupny"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6760,7 +6662,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6768,109 +6670,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "chvilinaŭ"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "_Dastasuj da statusu"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Spytaj paviedamleńnia statusu, kali ja:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Dałučajusia"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Adłučajusia"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Ukluč"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Paviedamleńnie statusu"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Kanfihuruj koler i šryft interfejsu"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Standartny zbor _ikon statusu:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Užyvaj _ikony transpartaŭ"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6880,119 +6782,129 @@ msgstr ""
 "kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
 "MSN)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 #, fuzzy
 msgid "Style"
 msgstr "Zatrymana"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Zdolnaści serveraŭ"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Прыватная размова"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Złučeńnie"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Server:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Kiruj..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Kali ŭklučanaja hetaja opcyja, Gajim zapomnić parol dla hetaha kontu"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Roznaje</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Adčyni..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Redaktar dadatkovych naładaŭ"
@@ -7183,12 +7095,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Uviadzi novy parol:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Admysłovyja dziejańni"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Skarystaj admysłovy host/port"
@@ -7275,7 +7187,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Dałučajusia"
@@ -7289,7 +7201,7 @@ msgstr "Stvary novy zapis"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7317,8 +7229,8 @@ msgstr "_Viarni zvyčajnyja kolery"
 msgid "Resets value to default"
 msgstr "_Viarni zvyčajnyja kolery"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Nazva hosta: "
@@ -7362,7 +7274,7 @@ msgstr "Niapravilnaje imia karystalnika"
 msgid "Proxy Host"
 msgstr "Proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Typ"
 
@@ -7376,8 +7288,7 @@ msgstr "_Pratakoł:"
 msgid "Copy info to clipboard"
 msgstr "S_kapijuj adras spasyłki"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 #, fuzzy
 msgid "Features"
 msgstr "Zdolnaści serveraŭ"
@@ -7563,6 +7474,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Ź_miani paviedamleńnie statusu"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -7641,8 +7557,8 @@ msgstr "Zatrymana"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7834,80 +7750,106 @@ msgstr "Niemahvyma dałučycca"
 msgid "_Name"
 msgstr "_Imia:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Pačni razmovu"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Pakiń pakoji"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Kiraŭnik žurnałaŭ"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Niemahvyma dałučycca"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Nałady"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Skonč pracu"
+msgid "_Accounts"
+msgstr "Konty"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Vyhlad"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Pakažy _adłučanyja kantakty"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Pakažy _transparty"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Kansol XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Pieradačy fajłaŭ"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Dapamoha"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Dałučany"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Dałučany"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Zdolnaści serveraŭ"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Pra siabie"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7922,6 +7864,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Pakiń pakoji"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8208,60 +8155,68 @@ msgstr "Kantakt adłučyŭsia"
 msgid "Create new group chat"
 msgstr "Pakiń pakoji"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Nałady"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "paviedamlennie statusu"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Pakažy _kansol XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Redahuj praviła</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kantakty"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Kantakty"
@@ -8337,12 +8292,16 @@ msgstr "Zapoŭni formu."
 msgid "Group Chat Configuration"
 msgstr "Zaprašeńnie ŭ pakoj"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Kansol XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Pačni razmovu"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
@@ -8389,11 +8348,6 @@ msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 msgid "Mute Sounds"
 msgstr "Ściš huki"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Nałady"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8716,124 +8670,124 @@ msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Pakoji"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Pakoji"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Dla hetaha pakoju nie akreślena tema"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Pakoji"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Pakoji"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Pakoji"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Niama złučeńnia z serveram"
@@ -8862,7 +8816,7 @@ msgid "Sender: %s"
 msgstr "Dasłaŭ: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Atrymaŭ: "
 
@@ -9016,7 +8970,7 @@ msgstr "Fajł: "
 msgid "It is not possible to send empty files"
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Adpraŭnik:"
 
@@ -9031,7 +8985,7 @@ msgid "Change"
 msgstr "Źmiani _mianušku"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Chutka viarnusia"
@@ -9062,11 +9016,12 @@ msgid "Password Change Failed"
 msgstr "Vymahaje parolu"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Źmiani parol"
 
@@ -9101,41 +9056,36 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Złučeńnie"
+msgid "Start / Join Chat"
+msgstr "Pačni razmovu"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Dadaj kantakt..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s nia znojdzieny"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Hety servis dahetul nie adkazaŭ na zapyt padrabiaznych źviestak"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9144,33 +9094,33 @@ msgstr ""
 "Hety servis nia zmoh adkazać na zapyt padrabiaznych źviestak.\n"
 "Servis sastareły albo złamany"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Inšyja"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Pakoj"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Nia možaš prahladać najaŭnyja servisy, nie dałučyŭšysia da servera"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prahlad servisaŭ dla kontu %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Prahlad servisaŭ"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Niemahčyma znajści servis"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9178,145 +9128,145 @@ msgstr ""
 "Niama servisu z akreślenym adrasam, albo jon nie adkazvaje. Pravier adras i "
 "pasprabuj znoŭ."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Niemahčyma ahladać hety servis"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Taki servis nia ŭtrymlivaje elementaŭ dla ahladańnia."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prahlad %s dla kontu %s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Prahladaj"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Hety servis nia ŭtrymlivaje elementaŭ dla prahladu."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Zahady: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "Š_ukaj"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Źmianić"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanavańnie %d / %d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Karystalniki"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Aŭtaryzavany"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 #, fuzzy
 msgid "Node"
 msgstr "Nijaki"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Novy zapis"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Aŭtaryzuj"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Dašli asobnaje paviedamleńnie"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "tema"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kali łaska, pravier, ci jość złučeńnie z \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
@@ -9363,91 +9313,75 @@ msgstr "Zarehistrujsia na %s"
 msgid "Registration failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Słoŭnik dla movy %s niedastupny"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
-"movu ŭ opcyi speller_language."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "dla kontu %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Numer GG:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
@@ -9462,6 +9396,11 @@ msgstr "Numer GG:"
 msgid "ICQ Number"
 msgstr "Numer ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Dadaj kantakt..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9517,7 +9456,7 @@ msgstr "Pamyłka dadańnia servisu. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9679,43 +9618,63 @@ msgstr "Kantakt adłučyŭsia"
 msgid "Contact Connected Background "
 msgstr "Kantakt dałučyŭsia"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Paviedamleńnie statusu"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Paviedamleńnie statusu"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Paviedamleńnie statusu"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Paviedamleńnie statusu"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Dziejny"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Niemahvyma dałučycca"
@@ -9739,10 +9698,9 @@ msgid "Error: %s"
 msgstr "Tekst pamyłki: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr ""
 
@@ -9756,48 +9714,48 @@ msgstr "Dziejny status: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Usie fajły"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Viečar"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Kiruj profilami proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Dastasuj da statusu"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Adłučany"
@@ -9818,7 +9776,7 @@ msgstr "Kont"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Novy kont paśpiachova stvorany"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9850,60 +9808,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Pakažy _adłučanyja kantakty"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Što chočaš zrabić?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Dałučajusia"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "%d niečytanaje paviedamleńnie"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Klijent Jabber dla GTK+"
@@ -9959,130 +9922,130 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Abiary vyjavu"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Usie fajły"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Usie fajły"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Vyšli _fajł"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Vyjavy"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Abiary vyjavu"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Usie fajły"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Zapišy fajł jak..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s hetaha pakoju"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 #, fuzzy
 msgid "Connected"
 msgstr "Złučeńnie"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Nazva fajłu: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Ściahni"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Zaciahni na server"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Pieradača fajłu spyniena"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 #, fuzzy
 msgid "Description: "
 msgstr "Apisańnie: %s"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?status pieradačy:Prypyniena"
@@ -10091,7 +10054,7 @@ msgstr "?status pieradačy:Prypyniena"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Niapravilny fajł"
@@ -10149,26 +10112,26 @@ msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Vymahaje parolu"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Nijaki"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Anuluj"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10187,11 +10150,6 @@ msgstr "praz kont %s"
 msgid "Hide _Contact List"
 msgstr "Kantakty"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Pakažy _adłučanyja kantakty"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
@@ -10241,36 +10199,31 @@ msgid ""
 msgstr ""
 "Adbyłasia pamyłka padčas publikacyi asabistych źviestak, pasprabuj paźniej."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Nałady"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Nałady"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Niama złučeńnia z serveram"
+msgid "Archiving Preferences Error"
+msgstr "_Nałady"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Atrymaŭ novy zapis:"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Nałady"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Dziejny"
@@ -10319,172 +10272,172 @@ msgstr "?Zapyt (aŭtaryzacyi):Niama"
 msgid "?password:Hidden"
 msgstr "Parol:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Nałady"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Niedastupny\""
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Złučeńnie"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "_Daj hołas"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Niedastupny\""
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Madyfikacyja kontu"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Vymahaje parolu"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Zachavaj parol"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Kiraŭnik žurnałaŭ"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Nałady"
@@ -10530,7 +10483,7 @@ msgstr "Niapravilnaja nazva śpisu"
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Kantakty"
@@ -10558,7 +10511,7 @@ msgstr "_Skonč"
 msgid "Commands"
 msgstr "Zahady: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10631,119 +10584,133 @@ msgstr "Zapyt aŭtaryzacyi ad %s"
 msgid "Loading"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Złučeńnie"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Dałučysia"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Vydalajecca kont %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Klikni, kab źmianić parol dla kontu"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Dałučajusia"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Server nie padtrymvaje Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Server nie padtrymvaje Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Dadaj kantakt..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Stvary novy zapis"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Abrany port musić być numeram portu."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Admysłovyja dziejańni"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Blakavańnie %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Vydalajecca kont %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Zarehistrujsia na %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Kont"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Kont paśpiachova dadany"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Konty"
@@ -10786,249 +10753,253 @@ msgstr "Šukaj"
 msgid "No results found"
 msgstr "%s nia znojdzieny"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "zahałovak statusu"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Pieradałučycca?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Pieradałučycca?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "Kali chočaš zadziejničać źmieny, treba pieradałučycca."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Niapravilnaja nazva kontu"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Usie adčynienyja vokny razmovy buduć začynienyja. Praciahnuć?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Niapravilnaja nazva kontu"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kantakty"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Niapravilnaje imia karystalnika"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Zlučajsia pry starcie Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Zachoŭvaj _žurnały razmoŭ dla ŭsich kantaktaŭ"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Usie statusy"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Skarystaj proxy dla pieradačy fajłaŭ"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " ad %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kantakty"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Pryjary_tet:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Złučeńnia niama"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Imia:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Proźvišča:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Novy list"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Dastasuj da statusu"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Ukluč"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Złučeńnie"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Zachavaj parol"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Niemahvyma dałučycca"
@@ -11083,19 +11054,19 @@ msgstr[0] "Vydalaje kantakt sa śpisu"
 msgstr[1] "Vydalaje kantakt sa śpisu"
 msgstr[2] "Vydalaje kantakt sa śpisu"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11107,21 +11078,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Stvary zakładku dla hetaja pakoju"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Ściežka da fajłu"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11178,127 +11149,233 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Zdolnaści serveraŭ"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Prahlad servisaŭ dla kontu %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kantakty"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Pakoji"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Niadaŭna:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Niemahvyma dałučycca"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Złučeńnie"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Słoŭnik dla movy %s niedastupny"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
+#~ "movu ŭ opcyi speller_language."
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "Kantakt adłučyŭsia"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Skonč pracu"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Pakažy _adłučanyja kantakty"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Dadaj kantakt..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Kantakty"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Pakiń pakoji"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Novaja hrupavaja razmova"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Kali opcyja maje vartaść True, Gajim pakazvaje ikonu na kožnaj kartcy ź "
+#~ "niečytanymi paviedamleńniami. U zaležnaści ad matyvu, hetaja ikona moža "
+#~ "być animavanaj."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Niapravilny znak u naźvie hostu."
+
+#~ msgid "Server address required."
+#~ msgstr "Patrabujecca adras servera."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Niapravilny znak u imiani karystalnika."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Niapravilny znak u naźvie krynicy."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Padzieja"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Padzieji"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Niama złučeńnia z serveram"
+
+#, fuzzy
 #~ msgid "Resource Conflict"
 #~ msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
@@ -11864,9 +11941,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Dasłać pryvatnaje paviedamleńnie"
 
-#~ msgid "Send _File"
-#~ msgstr "Vyšli _fajł"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Udzielniki"
@@ -13766,10 +13840,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgstr "Zatrymana"
 
 #, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Niemahvyma dałučycca"
-
-#, fuzzy
 #~ msgid "Security error during download"
 #~ msgstr "Niemahčyma złučycca z \"%s\""
 
@@ -13918,10 +13988,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Network-Watcher"
 #~ msgstr "Kiraŭnik žurnałaŭ"
 
-#, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Kiraŭnik žurnałaŭ"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -14208,9 +14274,6 @@ msgstr "Niemahvyma dałučycca"
 #~ "vybrać inšy.\n"
 #~ "Taksama moža spatrebicca źmianić nałady firewalla."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Źlej konty ŭ adno"
-
 #, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
diff --git a/po/bg.po b/po/bg.po
index 618f317de..f8c6b0250 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:43+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -18,77 +18,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Акаунти"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "и удостоверяването НЕ Е успешно"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Избор на изображение"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Не сте свързани към сървъра."
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Филтър за уединение"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Отлъчване на %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "П_родължаване"
 
@@ -157,502 +163,497 @@ msgstr "Няма чакащо запитване за записване."
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Показване на изкл_ючените контакти"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Изпълнение на команда"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "Управление на _транспорт"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Преименуване"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Деблокиране"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Блокиране"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "П_ремахване"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Информация"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Изпращане на _файл"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Запазване на файла като…"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Запазване на файла като…"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Последно състояние: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Покана на _контакти"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Добавяне на контакт…"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Запитване за файлов трансфер"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Лични разговори"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Информация"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "Ист_ория"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Изключени"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Пише"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Всички състояния"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Покана на _контакти"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Излизане от стаите"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Излизане от стаите"
+msgid "Rename…"
+msgstr "_Преименуване"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Промяна на _темата…"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Излизане от стаите"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Избор на изображение"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Нова стая"
+msgid "Configure…"
+msgstr "_Настройване"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Унищожаване на %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Неуспех при свързването"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Настроени съобщения:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Минимизиране при затваряне"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Минимизиране при автоматично влизане"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Смяна на псе_вдоним…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Глас"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Изпълнение на команда"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "Преди %i дни"
 msgstr[1] "Преди %i дни"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Пише"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Всички състояния"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Добавяне на контакт…"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Откриване на услуги"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Сървър"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Напреднали"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Настройки"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Списък с отлъчени"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Добавяне на стаята към отметките"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Настройки на стаята"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Синхронизиране"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Администратор"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Изпращане на съобщение от сървъра…"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Настройване на MOTD…"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Актуализиране на MOTD…"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Изтриване на MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Добавяне на контакт…"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Промяна на акаунт"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Промяна на акаунт"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Акаунти"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "Копиране на _JID/Е-поща"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Влизане в стая"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Добавяне на контакт…"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Копиране на адреса на връзката"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Отваряне на връзката в браузър"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "Копиране на _JID/Е-поща"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Отваряне на пощенската програма"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Копиране на адреса на връзката"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Уведомления"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "Копиране на _JID/Е-поща"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "По_кана"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Деблокиране"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Блокиране"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Изритване"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Забраняване на достъпа"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Собственик"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Администратор"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Член"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Член"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Глас"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "JID на стая"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "съобщение"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Емотикони:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Файлът не съществува"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "Адрес на AIM:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -660,29 +661,29 @@ msgstr "Дата"
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Съобщение"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Тема"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Грешка в базата от данни"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "създаване на база от данни за разговорите"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -695,283 +696,288 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте…"
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Из_чистване"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Вие"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s каза в %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Изтриване"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Отмяна на потвърждението"
 msgstr[1] "Отмяна на потвърждението"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
 msgstr[1] "Наистина ли искате да изтриете избраното съобщение?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Стандартно съобщение"
 msgstr[1] "Стандартно съобщение"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
 msgstr[1] "Наистина ли искате да изтриете избраните съобщения?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Общи"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Група"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "В групата"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Задаване на настроение"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Няма"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Презаписване на съобщението за състояние?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Това име вече се използва. Искате ли да презапишете това съобщение за "
 "състояние?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Съобщение за състояние"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Запазване като настроено…"
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "имам "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Състояние"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Име"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Сървър"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Този акаунт не е свързан към сървъра"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Изпращане на _файл"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Запазване на файла като…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Файлови трансфери"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Невалиден файл"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Изритване на %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Списък с отлъчени"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Запитване за файлов трансфер"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s зададе темата на %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Стаята показва отсъстващ член"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Стаята не показва отсъстващи членове"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "НЯМА да се запазва дневник за сесията"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Вашите лични данни, както са запазени на сървъра"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Стаята не е анонимна"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Стаята е полу-анонимна"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Стаята е напълно анонимна"
@@ -986,7 +992,7 @@ msgstr "Понг! (%s сек)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Понг! (%s сек)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Грешка."
 
@@ -1015,22 +1021,22 @@ msgstr "Беше създадена нова стая"
 msgid "Failed to Configure Group Chat"
 msgstr "Излизане от стаите"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s вече е познат като %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Вече сте познати като %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s вече е %(status)s"
@@ -1156,82 +1162,82 @@ msgstr "Сигурни ли сте, че искате да напуснете с
 msgid "If you close this window, you will leave '%s'."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Списък с емотикони (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Понг! (%s сек)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s от стая %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Пренебрегване на грешката за този сертификат."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "Изпра_щане и затваряне"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Ново съобщение"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "Изпра_щане и затваряне"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1240,189 +1246,180 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s вече е %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Файлови трансфери"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Размер: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_Акаунти"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Изключен"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Отваряне на папката"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Покана за разговор в стая"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Грешка при четене на файл:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Файловият трансфер е прекъснат"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Демон за уведомления"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Показване на събитието в спис_ъка"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Редактор на настройки за напреднали"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Настройки на стаята"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показване на всички _чакащи събития"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Започване на разговор"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Транспорти"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Стаи"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
@@ -1432,7 +1429,7 @@ msgstr "„%s“ винаги ще ви вижда като изключен."
 msgid "desynced"
 msgstr "без синхронизация"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1452,7 +1449,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Изход"
@@ -1603,8 +1601,8 @@ msgstr "Преименуване на група"
 msgid "Please enter a new name"
 msgstr "Създайте нова тема с желаното име."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Пре_именуване"
@@ -1623,27 +1621,32 @@ msgstr "Искате ли да премахнете групата „%s“ от
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Излизане от стаите"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Преименуване на контакт"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1652,21 +1655,21 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1677,25 +1680,25 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Преименуване на контакт"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1704,14 +1707,14 @@ msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1722,123 +1725,123 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Преименуване на контакт"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Съзидателен"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Искате ли да изпратите този файл на %s:"
 msgstr[1] "Искате ли да изпратите тези файлове на %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Изпращане"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Изпращане на %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Изпращане на файл до контакт"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Изпращане на файл до контакт"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "Публикуване на мелодия"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "По_кана в"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редактиране на _групи"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Пре_именуване"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "_Изключване"
+msgid "Execute command"
+msgstr "_Изпълнение на команда"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "Ист_ория"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1968,71 +1971,71 @@ msgstr "Лични разговори"
 msgid "Messages"
 msgstr "Съобщения"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Приемате ли това запитване за акаунт %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Упълномощаването беше изпратено"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Упълномощаването беше изпратено"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Няма"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Искане за записване"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Искане за записване"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2041,151 +2044,151 @@ msgstr ""
 "Винаги ще го виждате като изключен.\n"
 "Искате ли да го премахнете от списъка с контакти?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Отписване"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Поканени сте в стая."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Валидността на сертификата е изтекла"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Грешка при четене на файл:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Грешка в сертификата на SSL"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Файлови трансфери"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Да"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запитване за файлов трансфер"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Несигурна връзка"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2196,20 +2199,20 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Свързване"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2413,11 +2416,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вече не сте в стая „%(room)s“ или „%(nick)s“ е напуснал(а)."
@@ -2753,78 +2756,73 @@ msgstr ""
 "Не е указан аргумент „%(arg)s“.\n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s e папка, а би трябвало да е файл"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Унищожаване на %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Неизвестна грешка на SSL: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Ново съобщение от %(nickname)s"
 msgstr[1] "Ново съобщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Нова стая"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s промени състоянието си"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s вече е %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Контактът промени състоянието си"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s се включи"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s се изключи"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Неуспех при удостоверяването с „%s“"
@@ -2898,65 +2896,23 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Уведомяване за _включващи се контакти"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Уведомяване за _изключващи се контакти"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Показване на нови съобщения в изскачащ прозорец?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Уведомяване при завършване на файловия трансфер"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Уведомяване при завършване на файловия трансфер"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Цвят на фона на контактите, които се включват."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Списък (разделен с интервали) на редове (акаунти и групи), които да се "
 "свиват автоматично."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "по подразбиране"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Език, който да се използва за проверката на правописа"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2967,15 +2923,15 @@ msgstr ""
 "„print_ichat_every_foo_minutes“.\n"
 "„never“ - никога да не се изписва часа."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Тълкуване на двойки от „* / _“ като възможни символи за форматиране."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2984,7 +2940,7 @@ msgstr ""
 "Ако е активирана, не се премахват */_. Така *абв* ще е в получер стил, но "
 "със символите * *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2993,7 +2949,7 @@ msgstr ""
 "Знак за добавяне след името на псевдонима при използване на автоматично "
 "допълване (TAB) в стая."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -3002,17 +2958,17 @@ msgstr ""
 "Знак, който да се предложи да бъде добавен след желания псевдоним, когато "
 "той вече е използван от някой в стаята."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3025,24 +2981,24 @@ msgstr ""
 "документацията на Питон относно „strftime“ за повече информация: http://docs."
 "python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Знаци, които се изобразяват в разговори преди псевдонима"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Знаци, които се изобразяват в разговори след псевдонима"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
 "списъка."
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3051,28 +3007,28 @@ msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с „Enter“."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3081,13 +3037,13 @@ msgstr ""
 "Или определен адрес, съдържащ %s, където %s е думата/фразата, или "
 "„WIKTIONARY“, което означава използване на wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
 "remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3096,21 +3052,21 @@ msgstr ""
 "Когато не се изписва часа на всяко съобщение („print_time“ е настроено на "
 "„sometimes“), да се показва на всеки x минути."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3120,32 +3076,32 @@ msgstr ""
 "към локалните интерфейси за файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Уведомяване за събития в областта за уведомяване."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показване на границата на подпрозореца в прозорците за разговор?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Показване на нови съобщения в изскачащ прозорец?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3154,7 +3110,7 @@ msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3165,22 +3121,13 @@ msgstr ""
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
 "иконата в областта за уведомяване."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Ако е активирана, ще се изобразява икона във всеки подпрозорец, съдържащ "
-"непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3189,14 +3136,14 @@ msgstr ""
 "Ако е активирана, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Позиция на аватара в списъка.  Може да е ляво (left) или дясно (right)."
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3205,26 +3152,26 @@ msgstr ""
 "Ако е изключена, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Да не се показва списъка в панела."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3234,7 +3181,7 @@ msgstr ""
 "прозорецът ще мига (стандартното поведение при повечето мениджъри на "
 "прозорци) при задържане на чакащи събития."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3255,7 +3202,7 @@ msgstr ""
 "„pertype“ — Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
 "специфичен прозорец."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3263,35 +3210,35 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Ако е активирана, натискането на клавиша „Escape“ затваря прозореца/"
 "подпрозореца."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Скрива списъка на участниците в прозореца на стаята."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3300,18 +3247,18 @@ msgstr ""
 "В разговор, показва псевдонима в началото на реда само ако не е същия човек, "
 "който е написал предното съобщение."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-TAB отива на следващия подпрозорец, когато всички са прочетени."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3320,7 +3267,7 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3329,7 +3276,7 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3340,7 +3287,7 @@ msgstr ""
 "прозореца за промяна на акаунти. ВНИМАВАЙТЕ, понеже когато сте свързани с "
 "отрицателен приоритет, НЯМА да получите нито едно съобщение от сървъра."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3349,7 +3296,7 @@ msgstr ""
 "Ако е активирана, Gajim ще показва броя на включените контакти и общия брой "
 "в редовете за акаунти и групи."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3359,13 +3306,13 @@ msgstr ""
 "изпратил последното съобщение, в случай, че прозорецът за разговор не е вече "
 "отворен."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Необходимо време без активност преди прозорецът за промяна на състоянието да "
 "се затвори."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3373,11 +3320,7 @@ msgstr ""
 "Максимален брой редове, които да се показват в разговорите. Най-старите "
 "редове се изчистват."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Интервал между две проверки за липса на активност."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3386,56 +3329,56 @@ msgstr ""
 "Валидни схеми на адреси. Само схемите в този списък ще бъдат достъпни като "
 "„истински“ адреси."
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3444,11 +3387,7 @@ msgstr ""
 "Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
 "използва стандартно зададеното."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3456,37 +3395,37 @@ msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3495,7 +3434,7 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3504,7 +3443,7 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3513,7 +3452,7 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3522,7 +3461,7 @@ msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3531,28 +3470,32 @@ msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3561,7 +3504,7 @@ msgstr ""
 "Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
 "Приоритетите се настройват в опциите „autopriority_*“."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3572,17 +3515,17 @@ msgstr ""
 "„xa“, „dnd“ или „invisible“. ЗАБЕЛЕЖКА: Тази опция се използва само ако "
 "„restore_last_status“ е изключена."
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Ако е активирана, възстановява се последното използвано състояние."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3590,12 +3533,12 @@ msgid ""
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3604,22 +3547,22 @@ msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3628,7 +3571,7 @@ msgstr ""
 "Колко секунди да се чака за отговор на изпратен пакет за поддържане на "
 "връзката, преди да да се опита свързване наново."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3637,20 +3580,20 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
 "използва стандартно зададеното."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3658,17 +3601,17 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3677,28 +3620,24 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Грешка в сертификата на SSL"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3707,41 +3646,41 @@ msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Активира шифриране тип „ESessions“ за този акаунт."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3750,91 +3689,91 @@ msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Спя"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Хапвам"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Работя."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Филм"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Работя"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Работя."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Навън"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3843,1064 +3782,1064 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "За"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Не е установен"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Стаи"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Осветено съобщение в стая"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Покана за разговор в стая"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Покана за разговор в стая"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "С_тая"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Стаи"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Не е установен"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Създаването на стаи е ограничено."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Нова стая"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Услугата не може да бъде намерена"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Това не е стая"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Името на акаунта вече се използва."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Стаята %s не съществува."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Стаи"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Домакинствам"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Купувам хранителни продукти"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Чистя"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Готвя"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Ремонтирам"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Мия чиниите"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Пера"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Работя в градината"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Изпълнявам поръчка"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Разхождам кучето"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Пия"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Пия бира"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Пия кафе"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Пия чай"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Похапвам"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Закусвам"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Вечерям"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Обядвам"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Правя упражнения"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Карам велосипед"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Танцувам"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "На поход съм"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Тичам за здраве"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Спортувам"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Бягам"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Карам ски"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Плувам"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Тренирам"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Поддържам се"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "В Спа-центъра"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Мия си зъбите"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Подстригвам се"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Бръсна се"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Във ваната"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Взимам си душ"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "На среща"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Бездеен"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Почивен ден"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Вися си"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Крия се"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "В отпуск"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Моля се"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Планиран отдих"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Мисля"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Почивам"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Ловя риба"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Играя"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Навън съм"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "На купон съм"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Чета"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Репетирам"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "На пазар съм"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Пуша"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Общувам"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "На плаж съм"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Гледам телевизия"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Гледам филм"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Разговарям"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "На четири очи"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Говоря по телефона"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Говоря по видеотелефона"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Пътувам"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Пътувам от/до работа"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Карам велосипед"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "В колата"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "В автобуса"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "В самолета"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Във влака"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "На екскурзия"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Разхождам се"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Програмирам"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "На съвещание"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Уча"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Пиша"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Изумен"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Страстен"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Ядосан"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Раздразнен"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Обезпокоен"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Възбуден"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Засрамен"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Отегчен"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Смел"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Спокоен"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Предпазлив"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Бездушен"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Уверен"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Объркан"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Замислен"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Спорещ"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Раздразнителен"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Луд"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Съзидателен"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Любопитен"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Обезсърчен"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Депресиран"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Разочарован"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Отвратен"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Уплашен"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Шашнат"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Смутен"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Завистлив"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Развълнуван"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Склонен към флиртуване"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Разочарован"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Признателен"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Опечален"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Кисел"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Виновен"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Щастлив"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "С надежда"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Сгорещен"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Скромен"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Унизен"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Гладен"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Ранен"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Впечатлен"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Със страхопочитание"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Влюбен"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Възмутен"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Заинтересуван"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Пиян"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Непобедим"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Ревнив"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Самотен"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Безпомощен"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Късметлия"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Подъл"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Унил"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Нервен"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Безразличен"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Обиден"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Оскърбен"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Игрив"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Горд"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Отпуснат"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Облекчен"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Разкайващ се"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Неспокоен"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Тъжен"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Саркастичен"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Удовлетворен"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Сериозен"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Срамежлив"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Болен"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Сънен"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Спонтанен"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Стресиран"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Твърд"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Изненадан"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Благодарен"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Жаден"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Уморен"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Неопределен"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Слаб"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Обезпокоен"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "по подразбиране"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "морска"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Крия се"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Акаунт"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Акаунт"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Описание"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Грешка."
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "един"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "стая"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Неуспех при получаването на списъка с отменени сертификати"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Неуспех при дешифрирането на подписа на сертификата"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Неуспех при дешифрирането на подписа на списъка с отменени сертификати"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Неуспех при декодирането на публичния ключ на издателя"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Грешка при проверката на подписа на сертификата"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Грешка при проверката на подписа на списъка с отменени сертификати"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Сертификатът все още не е валиден"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Валидността на сертификата е изтекла"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "Валидността на списъка с отменени сертификати е изтекла"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка при форматирането на полето „notBefore“ на сертификата"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка при форматирането на полето „notAfter“ на сертификата"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „lastUpdate“ на списъка с отменени "
 "сертификати"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „nextUpdate“ на списъка с отменени "
 "сертификати"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Изчерпана памет"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Само-подписан сертификат"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Само-подписан сертификат в удостоверителската верига"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Неуспех при проверката на първия сертификат"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Удостоверителската верига е твърде дълга"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Сертификатът е отменен"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Невалиден сертификат на удостоверителя"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Максималната дължина на пътя е надвишена"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Неподдържана цел на сертификата"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Сертификатът не е доверен"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Сертификатът е отхвърлен"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Несъответствие на издателя на сертификата"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Несъответствие на идентификатора и сертифициращия орган"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Несъответствие на серийния номер на издателя и сертифициращия орган"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Основната употреба не включва подписване на сертификати"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Сертификатът е отменен"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Неизвестна грешка на SSL: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Валидността на сертификата е изтекла"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Упълномощаването е прието"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Емотиконите са изключени"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Валидността на сертификата е изтекла"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Искане за записване"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Разширението не се поддържа"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4962,12 +4901,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Настройки на стаята"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4979,294 +4918,253 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Невалиден символ в името на хоста."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Необходим е адрес на сървъра."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Невалиден символ в потребителското име."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Невалиден символ в ресурса."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Зает"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Зает"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Временно прекъснат"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Временно прекъснат"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Свързване"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Отсъствам"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Изключен"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "За"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "От"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Двустранно"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Неизвестна"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Записване"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Председатели"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Председател"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Участници"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Посетители"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Посетител"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Няма"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Собственик"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Собственик"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Член"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Член"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише съобщение…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d непрочетено съобщение"
 msgstr[1] "%d непрочетени съобщения"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "в _стаи"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " от потребител %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " от %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d чакащо събитие"
 msgstr[1] "%d чакащи събития"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
@@ -5371,85 +5269,85 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Файлът не съдържа нищо"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Шифрирането чрез E2E е изключено"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Промяна на информацията за състоянието"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Промяна на състоянието"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Настройване на съобщението за състояние и описанието му"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Свободен за разговор"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "На линия"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Не съм на разположение"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Не ме притеснявайте"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Изключен - изключване"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Описание на състоянието:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Състоянието беше променено."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Покана на _контакти"
@@ -5473,7 +5371,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Акаунт"
 
@@ -5484,7 +5382,7 @@ msgstr "Стаи"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Парола:"
@@ -5508,7 +5406,7 @@ msgstr "в _стаи"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Влизане"
@@ -5526,17 +5424,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Отказ"
 
@@ -5684,7 +5582,7 @@ msgstr "Информация за контакта"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Описание"
 
@@ -5889,39 +5787,44 @@ msgstr "Работа"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Относно"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Влизане в стая"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Връщам се скоро"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Влизане"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Премахване на акаунт „%s“"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5993,6 +5896,7 @@ msgid "Strike"
 msgstr "Болен"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Цвят"
 
@@ -6005,138 +5909,133 @@ msgstr ""
 msgid "Clear formatting"
 msgstr "Информация за контакта"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Избор на файл за изпращане…"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Списък с емотикони (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Отлъчване…"
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Смяна на псе_вдоним…"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Промяна на _темата…"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Въведете нова парола:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Излизане от стаите"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Възникна грешка:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Проверка наново…"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Участник"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Изритване"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Може да въведете и друго място за срещи:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Участник"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Нова стая"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Унищожаване на %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Може да въведете и друго място за срещи:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Причина"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Въведете ново име за група „%s“"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "По_кана"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Събитие"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Събитие"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6234,20 +6133,20 @@ msgid "Add"
 msgstr ""
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Премахване"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Състояние"
 
@@ -6257,7 +6156,7 @@ msgid "Client"
 msgstr "<b>Клиент:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Система:</b>"
@@ -6397,38 +6296,39 @@ msgstr "_Поведение на прозорците:"
 msgid "_Show contact list on startup"
 msgstr "П_оказване на списъка"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Смесване на акаунти"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Показване на _аватари на контактите в списъка"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6437,12 +6337,12 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
 "и стаите"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6451,53 +6351,53 @@ msgstr ""
 "Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
 "показват под имената им в списъка и в стаите"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Показване на _настроенията на контактите в списъка"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Покана на _контакти"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "в _стаи"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Изключване на контакт"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Проверка на правописа"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6510,29 +6410,29 @@ msgstr ""
 "натискане с десния бутон на мишката в полето за въвеждане, ще се използва "
 "езикът по подразбиране."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "текст на съобщението"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Списък с емотикони (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6541,58 +6441,58 @@ msgstr ""
 "Ако е изключена, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Неуспех при свързването"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6601,115 +6501,118 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Последно състояние: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Разговори"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Демон за уведомления"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "При получаване на ново събитие:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
 "Зает/Невидим"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
 "Зает/Невидим"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомяване за _включващи се контакти"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомяване за _изключващи се контакти"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Зрителни уведомления</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Изпълнение на з_вуци"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "_Управление…"
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Формат WAV"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Не съм на разположение"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6718,7 +6621,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
 "разположение“ когато компютърът не се използва по-дълго време."
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6727,7 +6630,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
 "разположение“ когато компютърът не се използва по-дълго време."
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6738,7 +6641,7 @@ msgstr ""
 "Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
 "сменя текущото съобщение."
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6749,40 +6652,40 @@ msgstr ""
 "Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
 "няма да се сменя текущото съобщение."
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "минути"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "_Съгласуване спрямо състоянието"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Включване"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6790,68 +6693,68 @@ msgstr ""
 "Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
 "използва стандартно зададеното."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Стандартно съобщение"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Включено"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Съобщение за състояние"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Настроени съобщения за състояние</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Тема"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Тема"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Настройване на цвят и шрифт на интерфейса"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "_Набор икони за състояние:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Използване на и_кони за транспортите"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6861,118 +6764,128 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Стил"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Възможности"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Стандартно съобщение"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Лични разговори"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Свързване"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Сървър:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Управление на…"
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Разни</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Отваряне…"
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Редактор на настройки за напреднали"
@@ -7157,12 +7070,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Въведете нова парола:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Действия за напреднали"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Използване на нестандартен хост/порт"
@@ -7248,7 +7161,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Включване"
@@ -7262,7 +7175,7 @@ msgstr "Създайте нова тема с желаното име."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7292,8 +7205,8 @@ msgstr "Възстановяване на стандартните _цветов
 msgid "Resets value to default"
 msgstr "Възстановяване на стандартните _цветове"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост:"
@@ -7337,7 +7250,7 @@ msgstr "Само-подписан сертификат"
 msgid "Proxy Host"
 msgstr "Сървър-посредник:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Тип"
 
@@ -7351,8 +7264,7 @@ msgstr "П_ротокол:"
 msgid "Copy info to clipboard"
 msgstr "_Копиране на адреса на връзката"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Възможности"
 
@@ -7539,6 +7451,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Пром_яна на съобщението за състояние"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Настроение:</b>"
@@ -7615,8 +7532,8 @@ msgstr "Блокирал"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7807,80 +7724,106 @@ msgstr "Неуспех при свързването"
 msgid "_Name"
 msgstr "_Име:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Сървър-посредник:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Започване на разговор"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Излизане от стаите"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Мениджър на историята"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Неуспех при свързването"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Настройки"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Изход"
+msgid "_Accounts"
+msgstr "Акаунти"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Изглед"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Показване на изкл_ючените контакти"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Показване на т_ранспорти"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML конзола"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Файлови трансфери"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "Помо_щ"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "На линия"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "На линия"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Възможности"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Относно"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7895,6 +7838,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Излизане от стаите"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8182,60 +8130,68 @@ msgstr "Изключване на контакт"
 msgid "Create new group chat"
 msgstr "Излизане от стаите"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Настройки"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Файлови трансфери"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "съобщение за състояние"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Показване на _XML конзола"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Изглед на разговорите</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Показване на изкл_ючените контакти"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Контакти"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Информация за контакта"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Преименуване на контакт"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Покана на _контакти"
@@ -8312,12 +8268,16 @@ msgstr "Попълнете формуляра."
 msgid "Group Chat Configuration"
 msgstr "Покана за разговор в стая"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML конзола"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Започване на разговор…"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Филтър:"
@@ -8363,11 +8323,6 @@ msgstr "Показване на всички _чакащи събития"
 msgid "Mute Sounds"
 msgstr "Изключване на звука"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Настройки"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8689,124 +8644,124 @@ msgstr "Файловият трансфер на %(filename)s от %(name)s пр
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Не е установен"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s влезе в стаята"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Осветено съобщение в стая"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Стаи"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Осветено съобщение в стая"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Не е установен"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Стаи"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Осветено съобщение в стая"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Не е установен"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Тази стая няма тема"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Стаи"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Стаи"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Стаи"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Не е установен"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Покана за разговор в стая"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "НЯМА да се запазва дневник за сесията"
@@ -8835,7 +8790,7 @@ msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Получател: "
 
@@ -8987,7 +8942,7 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Изпращач: "
 
@@ -9002,7 +8957,7 @@ msgid "Change"
 msgstr "Смяна на псе_вдоним…"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Връщам се скоро"
@@ -9033,11 +8988,12 @@ msgid "Password Change Failed"
 msgstr "Необходима е парола"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Възникна грешка при създаването на акаунта"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Промяна на парола"
 
@@ -9075,40 +9031,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Неизвестна грешка на SSL: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Продължен разговор"
+msgid "Start / Join Chat"
+msgstr "Започване на разговор"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Добавяне на контакт…"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s не е намерен"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9117,33 +9068,33 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е извън употреба или повредена"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Други"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Стаи"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9151,142 +9102,142 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Невалидно име на сървър"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Търсене в %(address)s от акаунт „%(account)s“"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Търсене"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Команди: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Търсене"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Сканиране на %(current)d / %(total)d…"
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Потребители"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Идентификатор"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Записан"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Възел"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Ново съобщение"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Изпращане на еднократно съобщение"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "тема"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
@@ -9333,93 +9284,75 @@ msgstr "Регистриране в %s"
 msgid "Registration failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Няма наличен речник за %s език"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"За да използвате проверката за правопис, трябва да инсталирате речник за %s "
-"или да изберете друг език чрез настройването на опцията „speller_language“.\n"
-"\n"
-"Функционалността за осветяване на сгрешени думи ще е изключена"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "за акаунт „%s“"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Номер на GG:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Покана за разговор в стая"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -9434,6 +9367,11 @@ msgstr "Номер на GG:"
 msgid "ICQ Number"
 msgstr "Номер на ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Добавяне на контакт…"
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9489,7 +9427,7 @@ msgstr "Грешка при добавянето на услугата. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9651,31 +9589,51 @@ msgstr "Изключване на контакт"
 msgid "Contact Connected Background "
 msgstr "Включване на контакт"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Съобщение за състояние"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Съобщение за състояние"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Съобщение за състояние"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Съобщение за състояние"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Невалиден псевдоним"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9684,12 +9642,12 @@ msgstr ""
 "Това име вече се използва. Искате ли да презапишете това съобщение за "
 "състояние?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Активен"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Неуспех при свързването"
@@ -9713,10 +9671,9 @@ msgid "Error: %s"
 msgstr "Грешка: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 #, fuzzy
 msgid "Error"
 msgstr "Грешка."
@@ -9731,48 +9688,48 @@ msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Всички файлове"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Чистя"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Настройки на сървъра-посредник"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Сървър-посредник:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Съгласуване спрямо състоянието"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Изключен"
@@ -9793,7 +9750,7 @@ msgstr "Акаунт"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Новият акаунт беше създаден успешно"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9825,60 +9782,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Синхронизиране"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Какво искате да направите?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Свързване"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Препращане на непрочетени съобщения"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Джабър клиент за GTK+"
@@ -9942,127 +9904,127 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Избор на файл за изпращане…"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Избор на изображение"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Всички файлове"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Всички файлове"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Изпращане на _файл"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Изображения"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Избор на изображение"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Всички файлове"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Запазване на файла като…"
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s на тази стая"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Свързан"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Изключен"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Име на файл: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Изтегляне"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Качване"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Файловият трансфер е преустановен"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Временно прекъснат"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Временно прекъснат"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Описание: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Временно прекъснат"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Временно прекъснат"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Временно прекъснат"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Временно прекъснат"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Временно прекъснат"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Временно прекъснат"
@@ -10071,7 +10033,7 @@ msgstr "Временно прекъснат"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Невалиден файл"
@@ -10127,26 +10089,26 @@ msgstr "Осветено съобщение в стая"
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Необходима е парола"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Няма"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Отказ"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10165,11 +10127,6 @@ msgstr "от акаунт „%s“"
 msgid "Hide _Contact List"
 msgstr "Покана на _контакти"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Показване на изкл_ючените контакти"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
@@ -10218,36 +10175,31 @@ msgid ""
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Настройки"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Настройки"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Не сте свързани към сървъра."
+msgid "Archiving Preferences Error"
+msgstr "_Настройки"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Грешка в получените данни"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Настройки"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Активирана"
@@ -10296,58 +10248,58 @@ msgstr "Няма"
 msgid "?password:Hidden"
 msgstr "Парола:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Настройки"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
 msgstr ""
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10356,21 +10308,21 @@ msgstr ""
 "Възможност за измерване на времето на бездействие, с цел да се установи "
 "автоматично съобщение за състояние."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Изисква dnsutils."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10378,56 +10330,56 @@ msgid ""
 msgstr ""
 "Разговори с автоматично открити контакти в локалната мрежа (без сървър)."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Изисква python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Изисква gpg и python-GnuPGInterface."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Свързване"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Изисква python-sexy."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 msgid "Feature is not available under Windows"
 msgstr ""
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Уведомления"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Изисква python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Запазване на паролата"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
@@ -10435,43 +10387,43 @@ msgid ""
 msgstr ""
 "Паролите могат да се съхраняват по сигурен начин, вместо в обикновен текст."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Изисква gnome-keyring и python-gnome2-desktop."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Проверка на правописа"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Изисква python-sexy."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Изисква python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Настройки"
@@ -10518,7 +10470,7 @@ msgstr "Невалидно име на филтър"
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Покана на _контакти"
@@ -10546,7 +10498,7 @@ msgstr "_Приключване"
 msgid "Commands"
 msgstr "Команди: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10619,118 +10571,132 @@ msgstr "Искане за записване от %s"
 msgid "Loading"
 msgstr "Програмирам"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Свързан"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Премахване на акаунт „%s“"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Натиснете, за да смените паролата на акаунта"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Свързване"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Сървърът ви не поддържа визитки"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Сървърът ви не поддържа визитки"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Добавяне на контакт…"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Създаване на ново съобщение"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Действия за напреднали"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Отлъчване на %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Неизвестна грешка на SSL: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Премахване на акаунт „%s“"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Регистриране в %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Акаунт"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Акаунти"
@@ -10773,253 +10739,257 @@ msgstr "Търсене"
 msgid "No results found"
 msgstr "Няма резултати"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "По подразбиране"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Свързване наново?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Свързване наново?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Невалидно име на акаунт"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Невалидно име на акаунт"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Покана на _контакти"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Само-подписан сертификат"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "С_вързване при стартиране"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Запазване на история на _разговорите за всички контакти"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Всички състояния"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Използване на сървъри-посредници за файлови трансфери"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " от %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Покана на _контакти"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Приори_тет:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Собствено име:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Фамилия:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Нова е-поща"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Съгласуване спрямо състоянието"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Активиране"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "По_рт:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Свързване"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Само-подписан сертификат"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Запазване на паролата"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Неуспех при свързването"
@@ -11074,19 +11044,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Премахване на контакт от списъка"
 msgstr[1] "Премахване на контакт от списъка"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Неизвестен изпълнител"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Неизвестно заглавие"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Неизвестен източник"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11100,22 +11070,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Добавяне на стаята към отметките"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Файлът не съдържа нищо"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Услугата изпрати лошо форматирани данни"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11172,127 +11142,242 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Показване на всички _чакащи събития"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Възможности"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Проверка на изходящите съобщения за правописни грешки."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Контакти"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Стаи"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Скоро посетени:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Неуспех при свързването"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Продължен разговор"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Неизвестна грешка на SSL: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Интервал между две проверки за липса на активност."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Няма наличен речник за %s език"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "За да използвате проверката за правопис, трябва да инсталирате речник за "
+#~ "%s или да изберете друг език чрез настройването на опцията "
+#~ "„speller_language“.\n"
+#~ "\n"
+#~ "Функционалността за осветяване на сгрешени думи ще е изключена"
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "_Изключване"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Изход"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Показване на изкл_ючените контакти"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Добавяне на контакт…"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Покана на _контакти"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Излизане от стаите"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Нова стая"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Ако е активирана, ще се изобразява икона във всеки подпрозорец, съдържащ "
+#~ "непрочетени съобщения. В зависимост от темата иконата може да бъде "
+#~ "анимирана."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Невалиден символ в името на хоста."
+
+#~ msgid "Server address required."
+#~ msgstr "Необходим е адрес на сървъра."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Невалиден символ в потребителското име."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Невалиден символ в ресурса."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Уведомяване за _включващи се контакти"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Уведомяване за _изключващи се контакти"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Показване на нови съобщения в изскачащ прозорец?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Уведомяване при завършване на файловия трансфер"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Уведомяване при завършване на файловия трансфер"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Цвят на фона на контактите, които се включват."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Събитие"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Събитие"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Не сте свързани към сървъра."
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Конфликт на ресурсите"
 
@@ -11902,9 +11987,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Изпращане на лично съобщение"
 
-#~ msgid "Send _File"
-#~ msgstr "Изпращане на _файл"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Участници"
@@ -14080,10 +14162,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Блокирал"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Неуспех при свързването"
-
 #~ msgid "cyan"
 #~ msgstr "синьозелена"
 
@@ -14599,9 +14677,6 @@ msgstr "Неуспех при свързването"
 #~ "Може да помислите и да промените настройките на огнената стена, "
 #~ "евентуално."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Смесване на акаунти"
-
 #, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP не може да бъде използван на този компютър"
@@ -15066,10 +15141,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Изисква python-gnome2."
 
-#, fuzzy
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Изисква gnome-keyring и python-gnome2-desktop."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/br.po b/po/br.po
index 215d5e6f3..e3f93f4bf 100644
--- a/po/br.po
+++ b/po/br.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -23,77 +23,81 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Kontoù"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
-#, fuzzy
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
-msgstr "Dibabit ur skeudenn"
+msgstr "Pegañ ar skeudenn"
 
-#: gajim/chat_control_base.py:753
-#, fuzzy
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
-msgstr "N'oc'h ket luget d'ar servijer"
+msgstr "Emaoc'h o klask pegañ ur skeudenn"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Chom hep goulenn ket"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Roll argas"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Argas %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Kenderc'hel"
 
@@ -160,501 +164,496 @@ msgstr ""
 msgid " resource with priority "
 msgstr ""
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Kas ur gemennadenn _simpl"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "urzhiad"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Dorioù"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Adenvel"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Dilemel"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Titouroù"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Kas ur _restr"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Stad diwezhañ: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Darempredoù"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Goulenn treuzkas"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Flap prevez"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Titouroù"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Istoradur"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "O skrivañ"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Stad:"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Darempredoù"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Flap a-stroll"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Flap a-stroll"
+msgid "Rename…"
+msgstr "_Adenvel"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Kemmañ ar _sujed"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Flap a-stroll"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Dibabit ur skeudenn"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Flap a-stroll"
+msgid "Configure…"
+msgstr "_Kenderc'hel"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Taolennadur: %s"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Kemennadennoù raklakaet:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Cheñch _lesanv"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "urzhiad"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i devezh 'zo"
 msgstr[1] "%i devezh 'zo"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "O skrivañ"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Stad:"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "restr"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Kas ur gemennadenn _simpl"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Dizoleiñ ar servijoù"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Servijer"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Dre ar munut"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Penndibaboù"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Roll argas"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Kefluniañ ar webgaoz"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Merour-ez"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Lakaat MOTD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Hizivaat MOTD"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Dilemel MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Kemmañ ar gont..."
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Kemmañ ar gont..."
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Kontoù"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopiañ ar JID/Chomlec'h postel"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Ouzhpennañ un darempred..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiañ chomlec'h an ere"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Digerién an ere er furcher web"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiañ ar JID/Chomlec'h postel"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Digeriñ ar bostelerez"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiañ chomlec'h an ere"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Kemmañ ar gont"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopiañ ar JID/Chomlec'h postel"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Diwelus"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Ermaeziañ"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Argas"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "_Perc'hener-ez"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Merour-ez"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "_Ezel"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "_Ezel"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 msgid "Revoke Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Webgaoz:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "kemennadenn"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Boulomelloù:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "_Chomlec'h:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Deiziad"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -662,316 +661,321 @@ msgstr "Deiziad"
 msgid "Nickname"
 msgstr "Lesanv"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Kemennadenn"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Titl"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "o krouiñ titourva an istoradur"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
 "reusable. This operation may take a while."
 msgstr ""
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Naetaat"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "C'hwi"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s e lâras %(who)s: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Dilemel"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Titouroù"
 msgstr[1] "Titouroù"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 msgstr[1] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Titour-stad"
 msgstr[1] "Titour-stad"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 msgstr[1] "Ha fellout a ra deoc'h da vat diverkañ ar c'hemennadennoù diuzet?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Anv an darempred: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Hollek"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Strollad"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Er strollad"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Lakaat MOTD"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Hini ebet"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Titour-stad"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Titour-stad"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Enrollañ evel raklakaet..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Enrollet e-barzh: %s"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Stad"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Anv"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Servijer"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Kas ur _restr"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Treuzkasoù"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Restr direizh"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Skarzhañ %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Roll argas"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Goulenn treuzkas"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Ce salon n'existe pas."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Titouroù diwar ho penn, miret war ar servijer"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Flapoù a-stroll"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Flapoù a-stroll"
@@ -986,7 +990,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Fazi en ur lenn ar restr:"
@@ -1015,22 +1019,22 @@ msgstr "Gant berzh eo bet krouet ho kont nevez!"
 msgid "Failed to Configure Group Chat"
 msgstr "Flap a-stroll"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s a zo bremañ %s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s a zo bremañ %(status)s"
@@ -1155,81 +1159,81 @@ msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Si vous fermer cette fenêtre, vous serez déconnecté de ces salons."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "O paouez resev ur gemennadenn nevez digant \"%s\" emaoc'h"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Kas & Serriñ"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Kas & Serriñ"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1238,191 +1242,182 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Treuzkasoù"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Taille : "
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Asantiñ"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Ezlinenn"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Digeriñ ar renkell pal"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Sac'het an treuzkas"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Nullet eo bet an treuzkas"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Diskouez er _roll hepken"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kefluniañ ar webgaoz"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Kregiñ da flapiñ"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Dorioù"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Flapoù a-stroll"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Kaset eo bet an aotre"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Ma asant \"%s\" ar c'houmanant e weloc'h he/e stad."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Adalek bremañ e welo ac'hanoc'h \"%s\" atav evel pa vefec'h ezlinenn."
@@ -1432,7 +1427,7 @@ msgstr "Adalek bremañ e welo ac'hanoc'h \"%s\" atav evel pa vefec'h ezlinenn."
 msgid "desynced"
 msgstr "Dre ar munut"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1452,7 +1447,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Kuitaat"
@@ -1606,8 +1602,8 @@ msgstr "_Adenvel"
 msgid "Please enter a new name"
 msgstr "Da _heul al lesanv:"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "_Adenvel"
@@ -1627,27 +1623,32 @@ msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Flap a-stroll"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1656,22 +1657,22 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Aotreañ an darempred-mañ da welout ma stad war-lerc'h e zilam"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1682,163 +1683,163 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Dizoberiant"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Fellout a ra da %s kas deoc'h ur restr:"
 msgstr[1] "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Kas"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Kas %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Strollañ %s ha %s"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Strollañ %s ha %s"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Embann"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr ""
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Kemmañ ar _strolladoù"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Dilemel"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "_Adenvel"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "Darempred diluget"
+msgid "Execute command"
+msgstr "urzhiad"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Istoradur"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Sellerien"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1969,222 +1970,222 @@ msgstr "Flapoù prevez"
 msgid "Messages"
 msgstr "Kemennadennoù"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Aotre HTTP (%s) evit %s (id : %s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Kaset eo bet an aotre"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Kaset eo bet an aotre"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Hini ebet"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Goulenn koumanantiñ"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Goulenn koumanantiñ"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Koumanantiñ"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Vous êtes banni de ce salon."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Treuzkasoù"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Mat eo"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Goulenn treuzkas"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Kevreadenn"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2192,20 +2193,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "O lugañ"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2401,11 +2402,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "N'emaoc'h ket er webgaoz \"%s\" ken, pe neuze eo aet kuit \"%s\"."
@@ -2729,79 +2730,74 @@ msgid ""
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Taolennadur: %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Aozadur D-Bus dianav: %s"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Kemennadenn nevez digant %(nickname)s"
 msgstr[1] "Kemennadenn nevez digant %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Flap a-stroll"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Emañ %(nickname)s o paouez lugañ"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Emañ %(nickname)s o paouez dilugañ"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
@@ -2864,77 +2860,36 @@ msgid ""
 msgstr ""
 
 #: gajim/common/config.py:93
-#, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Noti_fications d'état de discussion"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr ""
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr ""
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2943,29 +2898,29 @@ msgstr ""
 "M'eo gwir, ne vo ket dilamet */_. Neuze e vo *abc* tev ma ne vez ket dilamet "
 "* *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr ""
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr ""
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -2973,22 +2928,22 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -2997,30 +2952,30 @@ msgstr ""
 "Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
 "ivinell pe ur prenestr."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Kas ar gemennadenn gant Ctrl+Kas ha mont d'al linenn gant Kas (emzalc'h dre-"
 "ziouer ar poellad ICQ Mirabilis)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Niver a linennoù da zerc'hel soñj evit Ctrl+BirLaez"
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3029,89 +2984,83 @@ msgstr ""
 "Pe un url personelaet gant %s ennañ, %s o vezañ ar ger-kuzh pe 'WIKTIONARY' "
 "hag a dalvez implij wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "M'eo diuzet, e vo tu da sturiañ Gajim a-bell en ur implij gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
 msgstr ""
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Hervez ar standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_fications d'état de discussion"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
 msgstr ""
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
 "This setting is taken into account only if the notification area icon is "
 "used."
 msgstr ""
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3120,42 +3069,42 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
 "contact changes their status (and/or their status message)."
 msgstr ""
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
 "Window Managers) when holding pending events."
 msgstr ""
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3173,7 +3122,7 @@ msgstr ""
 "'peracct' - An holl gaozioù en ur prenestr hervez ar gont.\n"
 "'pertype' - Bep a brenestr gant ur stumm flapiñ (webgaoz/flap)."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3181,1626 +3130,1618 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "M'eo gwir, klikit war an douchenn Echap evit serriñ un ivinell/prenestr"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "A guzha roll ar berzhidi en ur prenestr webgaoz"
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking as in the previous message."
 msgstr ""
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr ""
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr ""
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
 "'file_transfer_proxies' option for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
 "your machine for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "O labourat 'maon."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "O labourat"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Er-maez"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "'muc_highlight_words' or your nickname is mentioned."
 msgstr ""
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Da"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Hini ebet"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Flapoù a-stroll"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Flap a-stroll"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Flapoù a-stroll"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Hini ebet"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Flap a-stroll"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Anv-kont implijet dija"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Ce salon n'existe pas."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Flapoù a-stroll"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Ger-kuzh faos"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cleaning"
 msgstr "Darvoud"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cooking"
 msgstr "O skrivañ"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Gardening"
 msgstr "O labourat"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Er strollad"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "O labourat"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 #, fuzzy
 msgid "Dancing"
 msgstr "Darvoud"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "Skarzhañ %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 #, fuzzy
 msgid "Jogging"
 msgstr "E_barzhiñ"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 #, fuzzy
 msgid "Skiing"
 msgstr "O labourat"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "O labourat"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Shaving"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cheñch ar sujed"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Hiding"
 msgstr "Skarzhañ %s"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Praying"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Thinking"
 msgstr "O labourat"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 #, fuzzy
 msgid "Relaxing"
 msgstr "Standard"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Fishing"
 msgstr "Skarzhañ %s"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 #, fuzzy
 msgid "Gaming"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "_Dilugañ"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Partying"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "Abeg"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Abeg"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 #, fuzzy
 msgid "Shopping"
 msgstr "O kousket"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 #, fuzzy
 msgid "Smoking"
 msgstr "O labourat"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sunbathing"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "O sellout ouzh ur film 'maon."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ouzh ar pellgomz emaon."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Traveling"
 msgstr "O treuzkas"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Commuting"
 msgstr "O skrivañ"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr ""
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Walking"
 msgstr "O labourat"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 #, fuzzy
 msgid "Coding"
 msgstr "O skrivañ"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "O labourat"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 #, fuzzy
 msgid "Aroused"
 msgstr "Ehan"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Bored"
 msgstr "Tev"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr ""
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 #, fuzzy
 msgid "Cautious"
 msgstr "Flapoù"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Cold"
 msgstr "Tev"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 #, fuzzy
 msgid "Confident"
 msgstr "_Endalc'hadoù"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Contemplative"
 msgstr "Echu"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Contented"
 msgstr "_Endalc'hadoù"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 #, fuzzy
 msgid "Creative"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 #, fuzzy
 msgid "Dejected"
 msgstr "Dilemel"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "Disappointed"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "Dismayed"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "Distracted"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Strollad"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "Hot"
 msgstr "_Ostiz:"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "kemennadenn"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Invincible"
 msgstr "Diwelus"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Lonely"
 msgstr "Hini ebet"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Lost"
 msgstr "_Ostiz:"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "Mean"
 msgstr "Hollek"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Moody"
 msgstr "_Kemmañ"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "Offended"
 msgstr "Ezlinenn"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Proud"
 msgstr "Strollad"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "Dilemel"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 #, fuzzy
 msgid "Satisfied"
 msgstr "Anv:"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Sick"
 msgstr "Lesanv"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Sleepy"
 msgstr "O kousket"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Stressed"
 msgstr "Straed:"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Surprised"
 msgstr "Emezelañ"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 #, fuzzy
 msgid "Tired"
 msgstr "Mare"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 #, fuzzy
 msgid "Undefined"
 msgstr "Islinennañ"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "Dilemel"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "Glas-mor"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Skarzhañ %s"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Bro:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Kont"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Taolennadur"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr ""
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "Hini ebet"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 #, fuzzy
 msgid "room"
 msgstr "Digant"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Ger-kuzh ret"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Aotre degmeret"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Ger-kuzh ret"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "War enaou emañ ar sifrañ"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4862,12 +4803,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kefluniañ ar webgaoz"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4879,298 +4820,257 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Arouezenn zireizh en anv-ostiz."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Chomlec'h ar servijer dre ret"
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Arouezenn ziereizh en anv-arveriad-ez"
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr ""
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr ""
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Dihegerz"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Hegerz"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Diskouez an eur:"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Ezvezant"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Da"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Digant"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "An daou"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Dianav"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Hini ebet"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "_Perc'hener-ez"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "_Merour-ez"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "_Ezel"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "a skriv ur gemennadenn..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Kas ur gemennadenn"
 msgstr[1] "Kas ur gemennadenn"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "Ebarzhiñ ur _webgaoz"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "ur restr eo %s met rankout a rafe bezañ ur renkell"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Emañ Gajim o vont da guitaat diouzhtu"
 
@@ -5269,90 +5169,90 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "Treug ar restr"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 #, fuzzy
 msgid "File does not exist"
 msgstr "Ce salon n'existe pas."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Lazhet eo ar sifrañ"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 #, fuzzy
 msgid "Change status information"
 msgstr "Titouroù"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 #, fuzzy
 msgid "Change status"
 msgstr "Darempred diluget"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 #, fuzzy
 msgid "Free for chat"
 msgstr "Prest da flapiñ"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 #, fuzzy
 msgid "Online"
 msgstr "_Kenderc'hel"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 #, fuzzy
 msgid "Presence description:"
 msgstr "Taolennadur"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Darempredoù"
@@ -5377,7 +5277,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Kont"
 
@@ -5388,7 +5288,7 @@ msgstr "Flapoù a-stroll"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Ger-kuzh:"
@@ -5412,7 +5312,7 @@ msgstr "Ebarzhiñ ur _webgaoz"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "E_barzhiñ"
@@ -5430,17 +5330,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Nullañ"
 
@@ -5592,7 +5492,7 @@ msgstr "Titouroù"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Taolennadur"
 
@@ -5799,39 +5699,44 @@ msgstr "Labour"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Diwar-benn"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Distro 'benn nebeut"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "E_barzhiñ"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Lemel ar gont %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5902,6 +5807,7 @@ msgid "Strike"
 msgstr "Lesanv"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr ""
 
@@ -5915,136 +5821,131 @@ msgstr "_Nodrezh:"
 msgid "Clear formatting"
 msgstr "Titouroù"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Dibabit ur restr da gas..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Oc'h argas..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Da _heul al lesanv:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Cheñch _lesanv"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Kemmañ ar _sujed"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Roit ur ger-kuzh nevez:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Flap a-stroll"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "Une erreur de protocole s'est produite :"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Perzhiad-ez"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Ermaeziañ"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 #, fuzzy
 msgid "Insert Emoji"
 msgstr "Gérer les frimousses"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Perzhiad-ez"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Argas"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Flap a-stroll"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Taolennadur: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Abeg"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Diwelus"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Darvoud"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Darvoudoù"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6143,20 +6044,20 @@ msgid "Add"
 msgstr "Chomlec'h"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Dilemel"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Une erreur de protocole s'est produite :"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Stad"
 
@@ -6166,7 +6067,7 @@ msgid "Client"
 msgstr "Poellad:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Personelaet</b>"
@@ -6309,38 +6210,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Diskouez ar _roll-darempredoù"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Strollañ ar c'hontoù"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6349,12 +6251,12 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6363,54 +6265,54 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Urzhiañ an darempredoù hervez o stad"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Darempredoù"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "Ebarzhiñ ur _webgaoz"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Darempred diluget"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6418,149 +6320,150 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "korf ar gemennadenn"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Stad diwezhañ: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Flap"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Pa resever un darvoud nevez"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Aotren ar c'helaouennoù p'emaon _ezvezant/dihegerz/busy/diwelus"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "Aotren ar c'helaouennoù p'emaon _ezvezant/dihegerz/busy/diwelus"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6569,51 +6472,51 @@ msgstr ""
 "Gajim vous signalera les nouveaux évènements dans une fenêtre en bas à "
 "droite de l'écran"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Kelaouennoù dre welet</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "_Seniñ"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Me_rañ..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Son"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 #, fuzzy
 msgid "Notifications"
 msgstr "Kemmañ ar gont"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Dihegerz"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6622,7 +6525,7 @@ msgstr ""
 "Si cette case est cochée, Gajim placera une icône dans la zone de "
 "notification"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6631,7 +6534,7 @@ msgstr ""
 "Si cette case est cochée, Gajim placera une icône dans la zone de "
 "notification"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6639,7 +6542,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6647,109 +6550,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "munutenn"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Goulenn an titour-stad pa:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Lugañ"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Dilugañ"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Titour-stad"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Enaouiñ"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Titour-stad"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Titouroù-stad raklakaet</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Gwiskadur"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Gwiskadur"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "_Arlunioù-stad dre-ziouer:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Implij arlunioù an _dorioù"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6759,120 +6662,130 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 #, fuzzy
 msgid "_Convert ASCII Emojis"
 msgstr "Gérer les frimousses"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Perzhioù ar servijerien"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Titour-stad"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Flap prevez"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Kevreadenn"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Servijer:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Kemmañ..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>A bep seurt</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Aozer kefluniañ dre ar munut"
@@ -7064,12 +6977,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Roit ur ger-kuzh nevez:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Actions a_vancées"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Implij un anv ostiz/porzh personelaet"
@@ -7156,7 +7069,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Lugañ"
@@ -7170,7 +7083,7 @@ msgstr "Ebarzhiñ ur _webgaoz"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7199,8 +7112,8 @@ msgstr "_Distreiñ gant al livioù dre-ziouer"
 msgid "Resets value to default"
 msgstr "_Distreiñ gant al livioù dre-ziouer"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Servijer:"
@@ -7244,7 +7157,7 @@ msgstr "Anv-arveriad-ez direizh"
 msgid "Proxy Host"
 msgstr "Proksi:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Doare"
 
@@ -7258,8 +7171,7 @@ msgstr "Protokol:"
 msgid "Copy info to clipboard"
 msgstr "_Kopiañ chomlec'h an ere"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 #, fuzzy
 msgid "Features"
 msgstr "Perzhioù ar servijerien"
@@ -7440,6 +7352,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Kemmañ an titour-stad"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -7515,8 +7432,8 @@ msgstr ""
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7718,79 +7635,105 @@ msgstr "échec lors de la publication de votre vCard"
 msgid "_Name"
 msgstr "_Anv:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proksi:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Kregiñ da flapiñ"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Flap a-stroll"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Merour an istoradur"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "échec lors de la publication de votre vCard"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Penndibaboù"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Kuitaat"
+msgid "_Accounts"
+msgstr "Kontoù"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
+msgid "_View"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Dorioù"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
+msgstr "Diskouez ar gonsol _XML"
+
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Treuzkasoù"
 
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Skoazell"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "_Kenderc'hel"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "_Kenderc'hel"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Perzhioù ar servijerien"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Diwar-benn"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7805,6 +7748,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Flap a-stroll"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8078,60 +8026,68 @@ msgstr "Darempred diluget"
 msgid "Create new group chat"
 msgstr "Flap a-stroll"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Penndibaboù"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Treuzkasoù"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "titour stad"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Diskouez ar gonsol _XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Darempredoù"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Titouroù"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Darempredoù"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Darempredoù"
@@ -8208,12 +8164,16 @@ msgstr "Er strollad"
 msgid "Group Chat Configuration"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr ""
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Kregiñ da flapiñ"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Sil:"
@@ -8261,11 +8221,6 @@ msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 msgid "Mute Sounds"
 msgstr "Sonioù wav"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Penndibaboù"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8587,124 +8542,124 @@ msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Hini ebet"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "Er strollad"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Flapoù a-stroll"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Hini ebet"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Flapoù a-stroll"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Hini ebet"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Flapoù a-stroll"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Flapoù a-stroll"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Flapoù a-stroll"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Hini ebet"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "N'oc'h ket luget d'ar servijer"
@@ -8733,7 +8688,7 @@ msgid "Sender: %s"
 msgstr "Kaser: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Resever:"
 
@@ -8884,7 +8839,7 @@ msgstr "Restr:"
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Kaser:"
 
@@ -8899,7 +8854,7 @@ msgid "Change"
 msgstr "Cheñch _lesanv"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Distro 'benn nebeut"
@@ -8930,11 +8885,12 @@ msgid "Password Change Failed"
 msgstr "Ger-kuzh ret"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Cheñch ar ger-kuzh"
 
@@ -8969,40 +8925,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Kevreadenn"
+msgid "Start / Join Chat"
+msgstr "Kregiñ da flapiñ"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Ouzhpennañ un darempred..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "N'eo ket bet kavet %s"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "N'eus ket bet kaset titouroù munut gant ar servij-mañ c'hoazh"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9011,33 +8962,33 @@ msgstr ""
 "N'eus ket bet kaset titouroù munut gant ar servij-mañ.\n"
 "Sur 'walc'h eo torr pe kamm"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Traoù all"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Webkaozioù"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Rankout a rit bezañ luget evit gellout furchal er servijoù hegerz"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9045,147 +8996,147 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal e seurt servijoù."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "O furchal e-barzh %s oc'h implij ar gont %s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Furchal"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Urzhioù: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Klask"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Aozañ"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Arveridi"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 #, fuzzy
 msgid "Subscribed"
 msgstr "Emezelañ"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 #, fuzzy
 msgid "Node"
 msgstr "Hini ebet"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Sal-flapiñ nevez"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Kas ur gemennadenn simpl"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "Titl"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
@@ -9232,88 +9183,74 @@ msgstr "Gant berzh eo bet embannet ar vCard"
 msgid "Registration failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "N'eus ket tu da gevreañ"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "evit ar gont %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
@@ -9326,6 +9263,11 @@ msgstr ""
 msgid "ICQ Number"
 msgstr ""
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Ouzhpennañ un darempred..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9382,7 +9324,7 @@ msgstr "fazi en ur gas %s ( %s )"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9544,31 +9486,51 @@ msgstr "Darempred diluget"
 msgid "Contact Connected Background "
 msgstr "Darempred luget"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Titour-stad"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Titour-stad"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Titour-stad"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Titour-stad"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9577,12 +9539,12 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Oberiant"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "échec lors de la publication de votre vCard"
@@ -9606,10 +9568,9 @@ msgid "Error: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr ""
 
@@ -9623,48 +9584,48 @@ msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP : "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "An holl restroù"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Darvoud"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Merañ an aeladoù proksi"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proksi:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Ezlinenn"
@@ -9685,7 +9646,7 @@ msgstr "Kont"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9717,60 +9678,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Diskouez an darempredoù _ezlinenn"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "O lugañ"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Gajim - %d gemennadenn nevez"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Ur flaperez Jabber e GTK+"
@@ -9828,131 +9794,131 @@ msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Dibabit ur restr da gas..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Dibabit ur skeudenn"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "An holl restroù"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "An holl restroù"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Kas ur restr"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Dibabit ur skeudenn"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "An holl restroù"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP : "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 #, fuzzy
 msgid "Connected"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 #, fuzzy
 msgid "Disconnected"
 msgstr "Darempred diluget"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Anv ar restr: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Pellgargañ"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Kas"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Sac'het an treuzkas"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Diskouez an eur:"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Diskouez an eur:"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 #, fuzzy
 msgid "Description: "
 msgstr "Taolennadur: %s"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Diskouez an eur:"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Diskouez an eur:"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 #, fuzzy
 msgid "?transfer status:Paused"
 msgstr "Diskouez an eur:"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Diskouez an eur:"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Diskouez an eur:"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Diskouez an eur:"
@@ -9961,7 +9927,7 @@ msgstr "Diskouez an eur:"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Restr direizh"
@@ -10019,26 +9985,26 @@ msgstr "Message d'un Salon mis en Sur-brillance"
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Hini ebet"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Nullañ"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10057,11 +10023,6 @@ msgstr "en ur implij ar gont %s"
 msgid "Hide _Contact List"
 msgstr "Darempredoù"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Diskouez an darempredoù _ezlinenn"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
@@ -10111,35 +10072,30 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Penndibaboù"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Penndibaboù"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "N'oc'h ket luget d'ar servijer"
+msgid "Archiving Preferences Error"
+msgstr "_Penndibaboù"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Penndibaboù"
-
 #: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
@@ -10190,171 +10146,171 @@ msgstr "Hini ebet"
 msgid "?password:Hidden"
 msgstr "Ger-kuzh:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Penndibaboù"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 msgid "Requires: geoclue"
 msgstr ""
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Kemmañ ar gont"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Merour an istoradur"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Penndibaboù"
@@ -10404,7 +10360,7 @@ msgstr "Anv-arveriad-ez direizh"
 msgid "You must enter a name to create a privacy list."
 msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Darempredoù"
@@ -10432,7 +10388,7 @@ msgstr "_Echuiñ"
 msgid "Commands"
 msgstr "Urzhioù: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10504,119 +10460,133 @@ msgstr "Goulenn enskrivañ digant %s"
 msgid "Loading"
 msgstr "O skrivañ"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Lugañ"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Lemel ar gont %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Klikit evit cheñch ger-kuzh ar gont"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "O lugañ"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "N'eus elfenn ebet da furchal er servij-mañ."
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 msgid "This server does not allow signup."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Darempredoù"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Actions a_vancées"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Argas %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Lemel ar gont %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Emezelañ war %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Kont"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Kontoù"
@@ -10659,244 +10629,248 @@ msgstr "Klask"
 msgid "No results found"
 msgstr "N'eo ket bet kavet %s"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Adlugañ bremañ?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Adlugañ bremañ?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "Ret eo deoc'h adlugañ evit ma vo sevenet an holl gemmoù diouzhtu."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 msgid "Please check if Bonjour is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Anv-kont direizh"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Anv-kont direizh"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Darempredoù"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Anv-arveriad-ez direizh"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "K_evreañ en ur loc'hañ Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Enrollaén an _istoradur-flapiñ evit an holl zarempredoù"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Stad:"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Implij ar proksioù evit treuzkas restroù"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "dibaoe %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Darempredoù"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Chom hep teurel pled eus ar c'hemennadennoù kaset gant tud dianav"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr ""
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "N'eus ket tu en em lugañ"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Anv:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Anv:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Postel nevez"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Enaouiñ"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Porzh:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Anv-arveriad-ez direizh"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "échec lors de la publication de votre vCard"
@@ -10949,19 +10923,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Dilemel an darempred diouzh ar roll"
 msgstr[1] "Dilemel an darempred diouzh ar roll"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10973,21 +10947,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Treug ar restr"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11044,127 +11018,211 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Perzhioù ar servijerien"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Merañ servijoù ar gont %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Darempredoù"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Flapoù a-stroll"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Nevez 'zo:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "échec lors de la publication de votre vCard"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Kevreadenn"
+
+#, fuzzy
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Aozadur D-Bus dianav: %s"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "N'eus ket tu da gevreañ"
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "Darempred diluget"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Kuitaat"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Diskouez an darempredoù _ezlinenn"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Ouzhpennañ un darempred..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Darempredoù"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Flap a-stroll"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Flap a-stroll"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Arouezenn zireizh en anv-ostiz."
+
+#~ msgid "Server address required."
+#~ msgstr "Chomlec'h ar servijer dre ret"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Arouezenn ziereizh en anv-arveriad-ez"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Noti_fications d'état de discussion"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Darvoud"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Darvoudoù"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "N'oc'h ket luget d'ar servijer"
+
+#, fuzzy
 #~ msgid "Unable to load image"
 #~ msgstr "Impossible de rejoindre le salon"
 
@@ -11644,9 +11702,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Kas ur gemennadenn brevez"
 
-#~ msgid "Send _File"
-#~ msgstr "Kas ur _restr"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Perzhidi"
@@ -13379,10 +13434,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "E2E encryption disabled"
 #~ msgstr "Lazhet eo ar sifrañ"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "échec lors de la publication de votre vCard"
-
 #~ msgid "cyan"
 #~ msgstr "Cyan"
 
@@ -13515,10 +13566,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Merour an istoradur"
 
 #, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Merour an istoradur"
-
-#, fuzzy
 #~ msgid "Hides the buttons in chat windows."
 #~ msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
@@ -13732,10 +13779,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Implij un anv ostiz/porzh personelaet"
 
 #, fuzzy
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Strollañ ar c'hontoù"
-
-#, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
diff --git a/po/ca.po b/po/ca.po
index e814cf60f..e6b85234e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2017-08-01 14:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,69 +18,75 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Comptes"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr ""
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr ""
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr ""
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr ""
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr ""
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr ""
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr ""
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 #, fuzzy
 msgid "_Continue"
 msgstr "Con_tinua"
@@ -139,482 +145,479 @@ msgstr ""
 msgid " resource with priority "
 msgstr ""
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Mostra els contactes desconnectats"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Voldria afegir-te a la meva llista de contactes."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Desbloquejar"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloca"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Esborra"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Envia _Fitxer"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Inactiva"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Convida _Contactes"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Afegeix Contacte..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "_Veu"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Disponible per parlar"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Informació personal"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "Historial"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Component només"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Tots els estats del xat"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Convida _Contactes"
+msgid "All Chat States"
+msgstr "Tots els estats del xat"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Grups de xat"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Grups de xat"
+msgid "Rename…"
+msgstr "Reescriu"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Canvia Tema..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Grups de xat"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Grups de xat"
+msgid "Configure…"
+msgstr "_Configura"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "_Destrueix Sala"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Connectors"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
-msgstr ""
+#: gajim/gui_menu_builder.py:584
+#, fuzzy
+msgid "Notify on all Messages"
+msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Minimitza en tancar"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Minimitza quan es connecta automàticament"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Canvia _Nick..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "Sol.licita Veu"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Executa Comanda...."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Component només"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Tots els estats del xat"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Afegeix Contacte..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Perfil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Envia un _Missatge únic..."
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
-msgstr ""
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
+msgstr "_Descobreix Serveis"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor:"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avançat"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 msgid "Blocking List"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Adreces d'interès"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Configuració de Sala"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Sincronitza els contactes"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Administra"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "Envia Missatge Privat"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 msgid "Set MOTD…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Suprimeix"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Afegeix Contacte..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Modifica Compte..."
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Modifica Compte..."
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Comptes"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Copia adreça JID/Email"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Uneix-te al xat en grup"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Afegeix Contacte..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Obri l'enllaç al navegador"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copia adreça JID/Email"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Obre Editor de Correu"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Copia adreça JID/Email"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Con_vida"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Desbloquejar"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Bloca"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "Fes fora"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Bandeja"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Propietari"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Administra"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "_Membre"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "_Membre"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "Sol.licita Veu"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 msgid "Copy"
 msgstr ""
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr ""
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr ""
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr ""
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "_Copia adreça JID/Email"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr ""
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -622,305 +625,310 @@ msgstr ""
 msgid "Nickname"
 msgstr ""
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr ""
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr ""
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "Cerca Base de Dades"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
 "reusable. This operation may take a while."
 msgstr ""
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Neteja"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr ""
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Històric de converses"
 msgstr[1] "Històric de converses"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Missatges preconfigurats:"
 msgstr[1] "Missatges preconfigurats:"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "General"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr ""
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr ""
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr ""
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Cap"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr ""
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr ""
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr ""
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Guardar com a Configuració..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 msgid "Please assign a name to this status message preset"
 msgstr ""
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 msgid "_Save"
 msgstr ""
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Estat"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr ""
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr ""
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr ""
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Envia _Fitxer"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Envia _Fitxer"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Transferència de Fitxers"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Gestiona Sala"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr ""
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Fes fora"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr ""
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "_Veu"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 #, fuzzy
 msgid "_Approve"
 msgstr "Aprova"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Informació sobre tu, tal i com està guardada al servidor"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informació sobre tu, tal i com està guardada al servidor"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Grups de xat"
@@ -935,7 +943,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr ""
 
@@ -962,22 +970,22 @@ msgstr ""
 msgid "Failed to Configure Group Chat"
 msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr ""
@@ -1101,252 +1109,243 @@ msgstr ""
 msgid "If you close this window, you will leave '%s'."
 msgstr ""
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr ""
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Mostra una llista de formats"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr ""
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr ""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 msgid "Close"
 msgstr ""
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr ""
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr ""
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr ""
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "Transferència de Fitxers"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr ""
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 msgid "_Accept"
 msgstr ""
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Desconnectat"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr ""
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Obre Carpeta Contenidora"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Configuració de Sala"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr ""
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr ""
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr ""
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr ""
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr ""
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr ""
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr ""
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr ""
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr ""
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr ""
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Grups de xat"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr ""
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr ""
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
 msgstr ""
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
@@ -1356,7 +1355,7 @@ msgstr ""
 msgid "desynced"
 msgstr "Avançat"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr ""
 
@@ -1373,7 +1372,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "Surt"
@@ -1513,8 +1513,8 @@ msgstr "Grups de xat"
 msgid "Please enter a new name"
 msgstr "Sobrenom:"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Reescriu"
@@ -1532,46 +1532,51 @@ msgstr ""
 msgid "_Also remove all contacts of this group from contact list"
 msgstr ""
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Grups de xat"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Sobrenom:"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Afegeix un contacte nou"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Esborra transferència de fitxer de la llista."
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr ""
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Esborra transferència de fitxer de la llista."
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1580,153 +1585,154 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Convida _Contactes"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr ""
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
 msgstr ""
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Crea nou missatge"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr ""
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr ""
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "Envia"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr ""
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr ""
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr ""
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr ""
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr ""
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vida a"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr ""
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr ""
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr ""
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Reescriu"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr ""
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "_Executa Comanda...."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historial"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Gestor d'Històric"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr ""
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1846,214 +1852,214 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr ""
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr ""
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr ""
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Autors:"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Autors:"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "No"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr ""
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr ""
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr ""
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "_Subscripció"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr ""
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr ""
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr ""
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr ""
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Escriu la teva contrasenya per al compte %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr ""
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Desa la contrasenya"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr ""
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr ""
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr ""
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Convida _Contactes"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 msgid "Error Opening File"
 msgstr ""
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Certificat de client"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr ""
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 msgid "Please enter a new username for your local account"
 msgstr ""
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr ""
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr ""
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr ""
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Avís abans d'una connexió insegura"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2061,20 +2067,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr ""
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Connexió"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2255,11 +2261,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr ""
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr ""
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2553,78 +2559,73 @@ msgid ""
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr ""
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Crea nou missatge"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Grups de xat"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s han entrat"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "El Contacte ha entrat"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr ""
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autenticació Anònima."
@@ -2684,101 +2685,63 @@ msgid ""
 msgstr ""
 
 #: gajim/common/config.py:93
-msgid "Notification color for contacts signing in."
-msgstr ""
-
-#: gajim/common/config.py:94
-msgid "Notification color for contacts signing out."
-msgstr ""
-
-#: gajim/common/config.py:95
-msgid "Notification color for new message notification."
-msgstr ""
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Notifica'm quan una transferència de fitxer ha acabat"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Notifica'm quan una transferència de fitxer ha acabat"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr ""
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr ""
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr ""
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
 msgstr ""
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr ""
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr ""
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -2786,171 +2749,165 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
 msgstr ""
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
 "'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
 msgstr ""
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr ""
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr ""
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
 msgstr ""
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
 "This setting is taken into account only if the notification area icon is "
 "used."
 msgstr ""
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
 "the contact name in the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
 "contact changes their status (and/or their status message)."
 msgstr ""
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
 "Window Managers) when holding pending events."
 msgstr ""
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -2962,7 +2919,7 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -2970,1521 +2927,1513 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 msgid "Hides the banner in a group chat window."
 msgstr ""
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 msgid "Hides the banner in a 1:1 chat window."
 msgstr ""
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 msgid "Hides the group chat participants list in a group chat window."
 msgstr ""
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking as in the previous message."
 msgstr ""
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr ""
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr ""
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Afegeix aquesta sala a les adreces d'interès"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr "La prioritat canviarà automàticament d'acord amb l'estat."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr ""
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Informació sobre tu, tal i com està guardada al servidor"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
 "'file_transfer_proxies' option for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr ""
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 msgid "Message that is sent to contacts you want to add."
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
 "your machine for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 msgid "The currently active encryption for that contact."
 msgstr ""
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr ""
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr ""
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr ""
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr ""
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 msgid "I'm eating."
 msgstr ""
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr ""
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr ""
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr ""
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr ""
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr ""
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr ""
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr ""
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr ""
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr ""
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr ""
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "'muc_highlight_words' or your nickname is mentioned."
 msgstr ""
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr ""
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 msgid "?Group chat name:Team"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Configuració de Sala"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Configuració de Sala"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 msgid "?Group chat description:Local news and reports"
 msgstr ""
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 msgid "Remote server not found"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
 msgstr ""
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Grups de xat"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr ""
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr ""
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr ""
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr ""
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr ""
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inactiva"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr ""
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr ""
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr ""
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr ""
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr ""
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr ""
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr ""
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr ""
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr ""
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr ""
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr ""
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr ""
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr ""
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr ""
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr ""
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr ""
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr ""
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr ""
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr ""
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr ""
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr ""
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr ""
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr ""
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr ""
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr ""
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr ""
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr ""
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 msgid "The certificate has been revoked"
 msgstr ""
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 msgid "Unknown validation error"
 msgstr ""
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 msgid "The certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autenticació Anònima."
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Comptes"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 msgid "Credentials expired"
 msgstr ""
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 msgid "Encryption required"
 msgstr ""
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 msgid "Authentication mechanism not supported"
 msgstr ""
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 msgid "Authentication mechanism too weak"
 msgstr ""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4545,12 +4494,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4562,289 +4511,248 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr ""
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr ""
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr ""
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr ""
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "Ocupat"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Ocupat"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr ""
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr ""
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Disponible per parlar"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "?user status:_Disponible"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?user status:_Disponible"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr ""
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr ""
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Absent"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "Desconnectat"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Desconnectat"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr ""
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr ""
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr ""
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr ""
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr ""
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr ""
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 msgid "Unknown"
 msgstr ""
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr ""
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr ""
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr ""
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderadors"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr ""
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr ""
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr ""
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr ""
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr ""
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr ""
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Propietari"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr ""
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Operacions d'Administració"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr ""
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "_Membre"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr ""
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr ""
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 msgid "is composing a message…"
 msgstr ""
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr ""
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr ""
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "Afegeix aquesta sala a les adreces d'interès"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr ""
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Voldria afegir-te a la meva llista de contactes."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr ""
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr ""
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr ""
 
@@ -4937,82 +4845,82 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 msgid "Encrypting file…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Lliure per xatejar"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Connectat"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr ""
 
@@ -5035,7 +4943,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Compte"
 
@@ -5046,7 +4954,7 @@ msgstr "Grups de xat"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
@@ -5069,7 +4977,7 @@ msgstr ""
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
 msgstr ""
 
@@ -5086,17 +4994,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -5240,7 +5148,7 @@ msgstr "El Certificat està xifrat"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr ""
 
@@ -5435,38 +5343,43 @@ msgstr ""
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Sobre l'aplicació"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Uneix-te al xat en grup"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 msgid "_Back"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Entra-hi"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Fusiona comptes"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5538,6 +5451,7 @@ msgid "Strike"
 msgstr "Ratllat"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Color"
 
@@ -5549,128 +5463,125 @@ msgstr "Tipus de lletra"
 msgid "Clear formatting"
 msgstr "Neteja el format"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Connexió"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Mostra una llista d'emoticones (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 msgid "Joining…"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Sobrenom:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Canvia _Nick..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Canvia Tema..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Desa la contrasenya"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Grups de xat"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Si està marcat, Gajim entrarà en aquest xat de grup a l'inici"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Hi ha hagut un error:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 msgid "Kick participant"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "Fes fora"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 msgid "Ban participant"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Bandeja"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Grups de xat"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "_Destrueix Sala"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 msgid "Reason (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Con_vida"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Tipus d'esdeveniment"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Descripció d'esdeveniment"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -5755,20 +5666,20 @@ msgid "Add"
 msgstr "Afegeix"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "Esborra"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Recurs:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr ""
 
@@ -5777,7 +5688,7 @@ msgid "Client"
 msgstr ""
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr ""
 
@@ -5909,99 +5820,100 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "C_onecta al servidor quan s'inicia"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Comptes"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Esborra transferència de fitxer de la llista."
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
 "in group chats"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Esborra transferència de fitxer de la llista."
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
 "name, in the contact list window, and in group chats"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Convida _Contactes"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6009,200 +5921,200 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 msgid "Show message recei_pts (✔)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Mostra una llista de formats"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 msgid "Show subject after _joining a group chat"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Connectors"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Mostra Contactes Actius"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Mostra Contactes Actius"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Inactiva"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 msgid "Show _notification area icon"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "S'ha rebut una nova entrada"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "Afegeix _Notificació Especial..."
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 msgid "Sounds"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "_No Disponible"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6210,7 +6122,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6218,219 +6130,229 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 msgid "Minutes"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Ajustar a estat"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 msgid "Themes"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Personalització Temes Gajim"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Personalització Temes Gajim"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Personalització Temes Gajim"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
 "ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Característiques"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 msgid "_Video input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Disponible per parlar"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Connexió"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Servidor MUC"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "Administra..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 msgid "_Store status changes of contacts in history"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Si està marcat, Gajim recordarà la contrasenya d'aquest compte"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Miscel·lània</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Editor de Configuració Avançada"
@@ -6601,12 +6523,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Desa la contrasenya"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Connectors"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Fa servir nomdeservidor/port"
@@ -6691,7 +6613,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 msgid "Sign Up"
 msgstr ""
 
@@ -6704,7 +6626,7 @@ msgstr "Afegeix aquesta sala a les adreces d'interès"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -6734,8 +6656,8 @@ msgstr "_Reinicia a configuració per defecte"
 msgid "Resets value to default"
 msgstr "_Reinicia a configuració per defecte"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Nom del servidor:"
@@ -6778,7 +6700,7 @@ msgstr "Certificat de client"
 msgid "Proxy Host"
 msgstr "Port del servidor intermediari:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Type"
 msgstr "_Tipus:"
@@ -6793,8 +6715,7 @@ msgstr "_Protocol:"
 msgid "Copy info to clipboard"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Característiques"
 
@@ -6977,6 +6898,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Canvia Missatge d'Estat..."
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Estat d'ànim:</b>"
@@ -7053,9 +6979,10 @@ msgid "Installed"
 msgstr "Instal·lat"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "La descripció del plugin s'hauria de mostrar aquí. Aquest text s'esborrarà "
 "durant la inicialització PluginsWindow."
@@ -7241,74 +7168,107 @@ msgstr "Connectors"
 msgid "_Name"
 msgstr "_Nom:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Prox_y:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Inicia Xat"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Grups de xat"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Gestor d'Històric"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Connectors"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Preferències"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "Surt"
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Comptes"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
+#, fuzzy
+msgid "_View"
 msgstr "Veure"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Mostra Contactes Actius"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
+#, fuzzy
+msgid "Show _Offline Contacts"
 msgstr "Mostra els contactes desconnectats"
 
 #: gajim/data/gui/application_menu.ui:50
-msgid "Show Active Contacts"
+#, fuzzy
+msgid "Show _Active Contacts"
 msgstr "Mostra Contactes Actius"
 
 #: gajim/data/gui/application_menu.ui:54
-msgid "Show Transports"
+#, fuzzy
+msgid "Show _Transports"
 msgstr "Mostra Transports"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
+msgstr "_Copia la ubicació de l'enllaç"
+
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Transferència de Fitxers"
 
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
+#, fuzzy
+msgid "_Help"
 msgstr "Ajuda"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Connectat"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Connectat"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "Dreceres de teclat"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Característiques"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Sobre l'aplicació"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7323,6 +7283,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Grups de xat"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -7594,53 +7559,61 @@ msgstr "_Canvia Missatge d'Estat"
 msgid "Create new group chat"
 msgstr "Grups de xat"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Preferències"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Connectors"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 msgid "File transfers"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Mostra els contactes desconnectats"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 msgid "Show only active contacts"
 msgstr "Mostra només contactes actius"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Mostra només contactes actius"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr ""
 
@@ -7713,12 +7686,16 @@ msgstr "Omple el formulari."
 msgid "Group Chat Configuration"
 msgstr "Configuració de Sala"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr ""
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "Inicia Xat..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filtra:"
@@ -7762,11 +7739,6 @@ msgstr ""
 msgid "Mute Sounds"
 msgstr ""
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Preferències"
-
 #: gajim/data/gui/single_message_window.ui:42
 msgid "_To"
 msgstr ""
@@ -8064,122 +8036,122 @@ msgstr ""
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 msgid "This group chat can not be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Grups de xat"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Configuració de Sala"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 msgid "Messages are archived on the server"
 msgstr ""
 
@@ -8207,7 +8179,7 @@ msgid "Sender: %s"
 msgstr ""
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr ""
 
@@ -8352,7 +8324,7 @@ msgstr ""
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr ""
 
@@ -8366,7 +8338,7 @@ msgid "Change"
 msgstr "Canvia _Nick..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 msgid "Back"
 msgstr ""
 
@@ -8395,11 +8367,12 @@ msgid "Password Change Failed"
 msgstr "Contrasenya:"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Cliqui per a canviar la contrasenya del compte"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Canviar contrasenya"
 
@@ -8434,213 +8407,208 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Històric de converses"
+msgid "Start / Join Chat"
+msgstr "Inicia Xat"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Uneix-te al xat en grup"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Afegeix Contacte..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "Grups de xat"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
 msgstr ""
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr ""
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Grups de xat"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr ""
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr ""
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr ""
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr ""
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr ""
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 msgid "_Command"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 #, fuzzy
 msgid "_Search"
 msgstr "Cerca:"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Edita"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Afegeix un contacte nou"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr ""
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Envia un _Missatge únic..."
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "Assumpte:"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr ""
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr ""
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr ""
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
@@ -8685,89 +8653,75 @@ msgstr ""
 msgid "Registration failed"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr ""
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Certificat de client"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "El Certificat està xifrat"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "expira"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Configuració de Sala"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -8780,6 +8734,11 @@ msgstr ""
 msgid "ICQ Number"
 msgstr ""
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Afegeix Contacte..."
+
 #: gajim/gtk/add_contact.py:260
 #, python-format
 msgid "%s Missing"
@@ -8834,7 +8793,7 @@ msgstr ""
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -8987,40 +8946,60 @@ msgstr ""
 msgid "Contact Connected Background "
 msgstr ""
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "_Canvia Missatge d'Estat"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "_Canvia Missatge d'Estat"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "_Canvia Missatge d'Estat"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "_Canvia Missatge d'Estat"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Personalització Temes Gajim"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Gestiona Sala"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 msgid "Spaces are not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 msgid "Do you want to delete this theme?"
 msgstr ""
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr ""
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Activa"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Connectors"
@@ -9044,10 +9023,9 @@ msgid "Error: %s"
 msgstr ""
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr ""
 
@@ -9061,47 +9039,47 @@ msgstr ""
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr ""
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr ""
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr ""
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Fitxer de Certificat de Client:"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Gestió de perfils de proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Prox_y:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "Ajustar a estat"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Desconnectat"
@@ -9122,7 +9100,7 @@ msgstr "Fila del compte "
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "El compte s'ha configurat correctament"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9153,59 +9131,64 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Entra a aquesta sala _automàticament quan em connecto"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Sincronitza els contactes"
+
+#: gajim/gtk/history_sync.py:203
 msgid "How far back should the chat history be synchronised?"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexió"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 msgid "A GTK XMPP client"
 msgstr ""
 
@@ -9257,118 +9240,118 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 msgid "Choose Avatar…"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Perfil"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 msgid "JPEG files"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Perfil"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 msgid "_Open"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Nom:"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 msgid "?Noun:Upload"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 msgid "?transfer type:Type: "
 msgstr ""
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?user status:_Disponible"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?user status:_Disponible"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr ""
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?user status:_Disponible"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?user status:_Disponible"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 #, fuzzy
 msgid "?transfer status:Paused"
 msgstr "?user status:_Disponible"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?user status:_Disponible"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?user status:_Disponible"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?user status:_Disponible"
@@ -9377,7 +9360,7 @@ msgstr "?user status:_Disponible"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Gestiona Sala"
@@ -9431,25 +9414,25 @@ msgstr ""
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "requereix"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Sí"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancel·la"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -9467,11 +9450,6 @@ msgstr ""
 msgid "Hide _Contact List"
 msgstr "Convida _Contactes"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Mostra Contactes Actius"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr ""
@@ -9514,33 +9492,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Preferències"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 msgid "Your archiving preferences have successfully been saved."
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:101
-msgid "No response from the Server"
-msgstr ""
-
-#: gajim/gtk/mam_preferences.py:103
-msgid "Error received: {}"
-msgstr ""
-
-#: gajim/gtk/mam_preferences.py:105
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
 msgid "Archiving Preferences Error"
 msgstr "Preferències"
 
+#: gajim/gtk/mam_preferences.py:108
+msgid "Error received: {}"
+msgstr ""
+
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr ""
@@ -9589,170 +9563,169 @@ msgstr "Descripció:"
 msgid "?password:Hidden"
 msgstr "Contrasenya:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "Preferències"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
 msgstr ""
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Connexió"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Sol.licita Veu"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 msgid "Feature is not available under Windows"
 msgstr ""
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Afegeix _Notificació Especial..."
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "requereix"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Desa la contrasenya"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
+#: gajim/gtk/features.py:129
+msgid "Requires: gnome-keyring or kwallet"
 msgstr ""
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Preferències"
@@ -9798,7 +9771,7 @@ msgstr ""
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Convida _Contactes"
@@ -9824,7 +9797,7 @@ msgstr "Acaba"
 msgid "Commands"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -9891,113 +9864,127 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Connexió"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Fusiona comptes"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Cliqui per a canviar la contrasenya del compte"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexió"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Aquesta entitat jabber no exposa cap comanda."
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 msgid "Signup not allowed"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 msgid "This server does not allow signup."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "_No Disponible"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Comptes"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Afegeix Contacte..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Crea nou missatge"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 msgid "Must be a port number"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Connectors"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 msgid "Security Warning"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, python-format
 msgid "Unknown TLS error '%s'"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Fusiona comptes"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 msgid "Register on the Website"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Fila del compte "
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "El compte s'ha configurat correctament"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Comptes"
@@ -10040,237 +10027,241 @@ msgstr "Cerca:"
 msgid "No results found"
 msgstr "Grups de xat"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr ""
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr ""
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr ""
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 msgid "Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 msgid "Re-Login now?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 msgid "Please check if Bonjour is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Compte"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, python-format
 msgid "Account %s is still connected"
 msgstr ""
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Compte"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Convida _Contactes"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Certificat de client"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onecta al servidor quan s'inicia"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Guarda registre de les converses amb tots els contactes"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Estat"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Sincronit_za l'estat del compte amb l'estat global"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Fer ús de proxis per a transferència de fitxers"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 msgid "Idle Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certificat de client"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Convida _Contactes"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 msgid "Ignore everything from contacts not in your Roster"
 msgstr ""
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tat:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "fa ús de la variable d'entorn HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Sinc_ronitza l'estat del compte amb l'estat global"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Nom:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Cognom:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 msgid "Email"
 msgstr ""
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Ajustar a estat"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr ""
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Connexió"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Certificat de client"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certificat de client"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "El Certificat està xifrat"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Desa la contrasenya"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Connectors"
@@ -10321,19 +10312,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10345,20 +10336,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Adreces d'interès"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr ""
@@ -10410,124 +10401,165 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Només en esdeveniments pendents"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Característiques"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "El Contacte ha entrat"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Grups de xat"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Historial"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 msgid "Plugin manager"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Històric de converses"
+
+#~ msgid "Quit"
+#~ msgstr "Surt"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Mostra Contactes Actius"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Afegeix Contacte..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Convida _Contactes"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Grups de xat"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Grups de xat"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Notifica'm quan una transferència de fitxer ha acabat"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Notifica'm quan una transferència de fitxer ha acabat"
+
+#~ msgid "Event Type"
+#~ msgstr "Tipus d'esdeveniment"
+
+#~ msgid "Event desc"
+#~ msgstr "Descripció d'esdeveniment"
+
 #~ msgid "Gajim: Account Creation Wizard"
 #~ msgstr "Gaim: Ajuda a Creació de Compte"
 
@@ -10730,9 +10762,6 @@ msgstr ""
 #~ msgid "_Send Private Message"
 #~ msgstr "Envia Missatge Privat"
 
-#~ msgid "Send _File"
-#~ msgstr "Envia _Fitxer"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Accions Ocupant"
@@ -10981,10 +11010,6 @@ msgstr ""
 #~ msgstr "#"
 
 #, fuzzy
-#~ msgid "Merge Accounts"
-#~ msgstr "Comptes"
-
-#, fuzzy
 #~ msgid "Reconnect when connection is lost"
 #~ msgstr "Reconnexió automàtica quan es perd la connexió"
 
@@ -11011,9 +11036,6 @@ msgstr ""
 #~ msgid "Please wait while the command is being sent..."
 #~ msgstr "Si us plau espera mentre la comanda s'envia..."
 
-#~ msgid "This jabber entity does not expose any commands."
-#~ msgstr "Aquesta entitat jabber no exposa cap comanda."
-
 #~ msgid "F_inish"
 #~ msgstr "Acabar"
 
@@ -11032,9 +11054,6 @@ msgstr ""
 #~ msgid "OpenPGP Key"
 #~ msgstr "Assigna Clau Open_PGP..."
 
-#~ msgid "_Start Chat"
-#~ msgstr "Inicia Xat"
-
 #, fuzzy
 #~ msgid "?print_status:All"
 #~ msgstr "Estat d'impressió:"
diff --git a/po/cs.po b/po/cs.po
index 55a873949..4a5613bdf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2010-01-22 14:35+0100\n"
 "Last-Translator: Petr Menšík <pihhan@cipis.net>\n"
 "Language-Team: <>\n"
@@ -33,77 +33,83 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Účty"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "a NEautentizovaný"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "Šifrování %(type)s %(status)s aktivní %(authenticated)s.\n"
 "Váš rozhovor %(logged)s zaznamenáván."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Vyberte obrázek"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Chystáte se zavřít několik panelů"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Nastavení Soukromí"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Zakazuji %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "Pokud odešlete soubor %s, tak bude znát vaše skutečné Jabber ID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -165,230 +171,222 @@ msgstr "Není zde žádný nevyřízený požadavek."
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Chtěl(a) bych si Vás přidat do mého Seznamu."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Spustit _příkaz..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "Transporty"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Přejmenovat"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Odblokovat"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokovat"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Odst_ranit"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Odeslat _Soubor"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Uložit jako..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Uložit jako..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Poslední stav: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Pozvat kontakt"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "Přid_at kontakt..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Žádost o hlasový rozhovor"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Velikost videa"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Informace o kontaktu"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Historie"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Píšu zprávu"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Všechny stavy"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Pozvat kontakt"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Opustit diskuzi"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Opustit diskuzi"
+msgid "Rename…"
+msgstr "_Přejmenovat"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Změnit _předmět"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Opustit diskuzi"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Vyberte obrázek"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Nová diskuze"
+msgid "Configure…"
+msgstr "_Nastavit"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Likviduji: %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registrace selhala"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Uložené stavy:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Minimalizovat při zavření"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Minimalizovat po připojení"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Změ_nit přezdívku"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hlas"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "Spustit _příkaz..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -396,273 +394,276 @@ msgstr[0] "před %i dny"
 msgstr[1] "před %i dny"
 msgstr[2] "před %i dny"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Píšu zprávu"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Všechny stavy"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "Přid_at kontakt..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "soubor"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Odeslat jednoduchou _zprávu"
 
 # FIXME: chtelo by to cesky vyraz pro service discovery
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Prohlížet služby"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nastavení"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban List"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Záložky"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Nastavení místnosti"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Synchronizovat"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Správce"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "Ode_slat zprávu serveru"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Nastavit MOTD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Upravit MOTD"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Smazat MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "Přid_at kontakt..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Upravit účet"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Upravit účet"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Účty"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Připojit se do diskuze"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "Přid_at kontakt..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopírovat odkaz"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otevřít v prohlížeči"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otevři Emailový editor"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopírovat odkaz"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Upozornění"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "_Pozvat do"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Odblokovat"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Blokovat"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "Vy_kopnout"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Zakázat"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Vlastník"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Správce"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Člen"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Člen"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Hlas"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "JID Místnosti"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "zpráva"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Smajlíky:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Soubor neexistuje"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM adresa:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -670,29 +671,29 @@ msgstr "Datum"
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Zpráva"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Předmět"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Chyba Databáze"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "vytvářím databázi historie"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -705,28 +706,28 @@ msgstr ""
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Vymazat"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Vy"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s v %(time)s řekl(a): %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Smazat"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -734,7 +735,7 @@ msgstr[0] "Zrušit ověření"
 msgstr[1] "Zrušit ověření"
 msgstr[2] "Zrušit ověření"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -742,7 +743,7 @@ msgstr[0] "Vážně chcete smazat vybranou zprávu?"
 msgstr[1] "Vážně chcete smazat vybranou zprávu?"
 msgstr[2] "Vážně chcete smazat vybranou zprávu?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -750,7 +751,7 @@ msgstr[0] "Výchozí Zpráva"
 msgstr[1] "Výchozí Zpráva"
 msgstr[2] "Výchozí Zpráva"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -758,234 +759,239 @@ msgstr[0] "Vážně chcete smazat vybranou zprávu?"
 msgstr[1] "Vážně chcete smazat vybrané zprávy?"
 msgstr[2] "Vážně chcete smazat vybrané zprávy?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Obecné"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Skupina"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Ve skupině"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Nastavit Náladu"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Žádný"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Přepsat Text stavu?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Toto jméno je již použito. Chcete přepsat text stavu?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Text stavu"
 
 # FIXME: not accurate
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Uložit stav..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Napište jméno pro tento stav"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Má"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Stav"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Jméno"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "audio a video"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "audio"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "video"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s chce zahájit %(type) sezení. Chcete na volání odpovědět?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Odeslat _Soubor"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Uložit jako..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Neplatný soubor"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Vyhazuji %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Ban List"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Žádost o hlasový rozhovor"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 #, fuzzy
 msgid "_Approve"
 msgstr "schválit"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s nastavil předmět na %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Místnost nyní zobrazuje nedostupné členy"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "místnost nyní nezobrazuje nedostupné členy"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Sezení NEBUDE logováno"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informace o Vás, jak jsou uloženy na serveru"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Místnost není anonymní"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Místnost je částečně anonymní"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Místnost je plně anonymní"
@@ -1000,7 +1006,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Chyba."
 
@@ -1029,22 +1035,22 @@ msgstr "Nová místnost byla vytvořena"
 msgid "Failed to Configure Group Chat"
 msgstr "Opustit diskuzi"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s se přejmenoval na %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s je nyní %(status)s"
@@ -1171,81 +1177,81 @@ msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Zobrazit seznam formátování"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Tento kontakt nepodporuje přenos souborů."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s stav: %(state)s, důvod: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskuze %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Právě jsi obdržela novou zprávu od \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "Ode_slat a zavřít"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nová zpráva"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "Ode_slat a zavřít"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1254,186 +1260,177 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s je nyní %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Přenosy souborů"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Velikost: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Přijmi"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Odpojen"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otevřít obsahující složku"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Protějšek zastavil přenos"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Chyba při čtení souboru"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Přenos souboru zastaven"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Přenos souboru zrušen"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Zobrazit událost v rosteru"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor rozšířeného nastavení"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Nastavení místnosti"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Zobrazit všechny čekající _události"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Začít rozhovor"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Diskuze"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizace byla odeslána"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho stav."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizace byla zrušena"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
@@ -1444,7 +1441,7 @@ msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 msgid "desynced"
 msgstr "nesynchronizováno"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1464,7 +1461,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Vždy zavřít Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Konec"
@@ -1624,8 +1622,8 @@ msgstr "Přejmenovat skupinu"
 msgid "Please enter a new name"
 msgstr "Vytvořte vaše nové téma."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Přejme_novat"
@@ -1644,27 +1642,32 @@ msgstr "Chceš smazat skupinu %s z rosteru?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Odstranit také všechny kontakty v této skupině z Vašeho rosteru"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Opustit diskuzi"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Chystáte se smazat \"%(name)s\" (%(jid)s) z vašeho rosteru.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1673,21 +1676,21 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Chci aby tento kontakt věděl o mém stavu i po odstranění"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1698,25 +1701,25 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1725,12 +1728,12 @@ msgstr ""
 "Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při "
 "přístím připojení uloženy."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1741,21 +1744,21 @@ msgstr ""
 "jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v "
 "transportech."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Tvořivý"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1763,101 +1766,102 @@ msgstr[0] "Chcete poslat %s tento soubor:"
 msgstr[1] "Chcete poslat %s tyto soubory:"
 msgstr[2] "Chcete poslat %s tyto soubory:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "Ode_slat"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Odeslat %s %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Udělej %s a %s metakontaktem"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Udělej %s a %s metakontaktem"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Zveřejnit hudbu"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Upravit _skupiny"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "Odst_ranit"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Přejme_novat"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Znovu připojit"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "Spustit _příkaz..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historie"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1987,70 +1991,70 @@ msgstr "Soukromé rozhovory"
 msgid "Messages"
 msgstr "Zprávy"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizace pro %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Autorizace byla odeslána"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Autorizace byla odeslána"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Žádný"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Žádost o autorizaci"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Žádost o autorizaci"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2059,149 +2063,149 @@ msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Autorizace zrušena"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Jste pozván do diskuze"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Platnost certifikátu vypršela"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Protějšek zastavil přenos"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Chyba při čtení souboru"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce zahájit hlasový rozhovor. "
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Žádost o hlasový rozhovor"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Nezabezpečené Spojení"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2211,21 +2215,21 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Připojuji se"
 
 # FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2428,11 +2432,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Už nejsi v místnosti \"%(room)s\" nebo \"%(nick)s\" odešel(a)."
@@ -2761,28 +2765,23 @@ msgstr ""
 "Parametr \"%(arg)s\" nebyl uveden. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je adresář, ale měl by to být soubor"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Jím"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Neznámá SSL chyba: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2790,50 +2789,50 @@ msgstr[0] "Nová zpráva od %(nickname)s"
 msgstr[1] "Nová zpráva od %(nickname)s"
 msgstr[2] "Nová zpráva od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Nová diskuze"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Změnil(a) stav"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je nyní %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentizace selhala s \"%s\""
@@ -2906,64 +2905,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Upozorni mě na kontakty které se přihlásí"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Upozorni mě na kontakty které se odhlásí"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Upozornit mě po dokončení přenosu souboru"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Upozornit mě po dokončení přenosu souboru"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "výchozí"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Jazyk použitý kontrolou pravopisu"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2973,15 +2930,15 @@ msgstr ""
 "'někdy' - vypiš čas každou print_ichat_every_foo_minutes minutu.\n"
 "'nikdy' - nevypisuj čas."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Ber * / _ páry jako možné formátovací znaky."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2989,7 +2946,7 @@ msgid ""
 msgstr ""
 "Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2998,7 +2955,7 @@ msgstr ""
 "Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v "
 "diskuzi."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -3007,17 +2964,17 @@ msgstr ""
 "Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo "
 "jiný v diskuzi."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3030,24 +2987,24 @@ msgstr ""
 "informací shlédněte dokumentaci pythonu funkce strftime na: http://docs."
 "python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Znaky, které budou vypisovány před přezdívkou v rozhovorech"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Znaky, které budou vypisovány za přezdívkou v rozhovorech"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3056,12 +3013,12 @@ msgstr ""
 "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
 "rozhovoru znovu otevřena."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3070,19 +3027,19 @@ msgstr ""
 "Kolik vteřin čekat před automatickým znovu vstoupením do diskuze, ze které "
 "jste odpojován(a). Nastavte na 0 pro vypnutí automatického znovu vstoupení."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí "
 "chování klienta Mirabilis ICQ)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3091,11 +3048,11 @@ msgstr ""
 "Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', "
 "která znamená že se použije wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Pokud zaškrtnuta, Gajim může být ovládán vzdáleně pomocí gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3104,15 +3061,15 @@ msgstr ""
 "Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji "
 "každých x minut."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3122,7 +3079,7 @@ msgstr ""
 "mohou ztratit data (rozhovor, soukromý rozhovor, diskuze které nebudou "
 "minimalizovány)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3132,39 +3089,39 @@ msgstr ""
 "rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním "
 "portů."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Upozorni na události v systémovém trayi."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj panelu v oknech rozhovorů?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
 msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3174,22 +3131,13 @@ msgstr ""
 "Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. "
 "Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
-"zprávy. V závislosti na tématu, tato ikona může být animovaná."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3198,13 +3146,13 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
 "kontakt pod jménem v okně Seznamu."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Nastavení pozice avatara v rosteru. Může být vlevo nebo vpravo"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3213,26 +3161,26 @@ msgstr ""
 "Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když "
 "kontakt změní jeho stav a/nebo jeho stavovou zprávu."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Nezobrazuj roster v liště úloh."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3242,7 +3190,7 @@ msgstr ""
 "oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
 "události."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3262,7 +3210,7 @@ msgstr ""
 "zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, "
 "aby se projevila"
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3270,32 +3218,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Pokud je False, nebudete nadále vidět avatary v okně rozhovoru"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Pokud je True, stiskem escape zavřete panel nebo okno"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Skryje nadpis v okně diskuze"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Skryje nadpis v okně diskuze"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3305,18 +3253,18 @@ msgstr ""
 "stejný člověk, jako v předchozí zprávě."
 
 # FIXME: netusim co to je... najit
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Odsazení při použítí spojení po sobě jdoucích přezdívek."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab jde na další rozepsanou záložku, když žádný není nepřečtená."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3325,7 +3273,7 @@ msgstr ""
 "Mám zobrazit dialog potvrzení blokace, nebo ne? Prázdný řetezec znamená "
 "nikdy nezobrazovat dialog."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3334,7 +3282,7 @@ msgstr ""
 "Mám zobrazit dialog potvrzení blokace, nebo ne? Prázdný řetezec znamená "
 "nikdy nezobrazovat dialog."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3345,7 +3293,7 @@ msgstr ""
 "BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru "
 "žádnou zprávu."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3354,7 +3302,7 @@ msgstr ""
 "Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u "
 "řádků skupin."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3363,11 +3311,11 @@ msgstr ""
 "Je-li povoleno, Gajim bude posune a vybere kontakt, který vám poslal "
 "poslední zprávu, pokud již okno rozhovoru není otevřené."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Čas neaktivity před zavřením okna změny stavu."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3375,11 +3323,7 @@ msgstr ""
 "Maximální počet řádků, které se vypíší v konverzacích. Nejstarší řádky jsou "
 "smazány."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3388,58 +3332,58 @@ msgstr ""
 "Platná uri schémata. Pouze schémata v tomto seznamu budou akceptována jako "
 "\"skutečné\" URI. (mailto a xmpp jsou obsluhovány zvlášť)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Je-li True, doplňování přezdívek v diskuzích bude porobné doplňování shellu"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3448,11 +3392,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim se nebude pokáždé ptát na zprávu stavu. Místo toho "
 "použije výchozí nadefinovanou zprávu."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3460,58 +3400,58 @@ msgstr ""
 "Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
 "k účtům."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3520,7 +3460,7 @@ msgstr ""
 "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
 "vypnutá."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3529,28 +3469,32 @@ msgstr ""
 "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
 "vypnutá."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Přidat tuto místnost do záložek"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3559,7 +3503,7 @@ msgstr ""
 "Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v "
 "nastavení jako položky autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3570,18 +3514,18 @@ msgstr ""
 "'nedostupný', 'nerušit', 'neviditelný'. POZNÁMKA: toto nastavení může být "
 "použito pouze pokud restore_last_status je vypnutý"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Je-li povoleno, nastaví se vždy poslední použitý stav."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr "Je-li True, kontakty požadující autorizaci budou automaticky přijaty."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3589,34 +3533,34 @@ msgid ""
 msgstr ""
 "Pokud je False, účet bude deaktivován a nebude zobrazen v okně rosteru."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3625,7 +3569,7 @@ msgstr ""
 "Kolik sekund se má čekat na odpověď pingu před tím, než se znovu pokusit o "
 "připojení."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3634,36 +3578,36 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
 "volbě pro přenos souborů file_transfer_proxies."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Pokud zaškrtnuto, Gajim se nebude pokáždé ptát na zprávu stavu. Místo toho "
 "použije výchozí nadefinovanou zprávu."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Vám chce poslat soubor."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3672,28 +3616,24 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
 "volbě pro přenos souborů file_transfer_proxies."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3702,41 +3642,41 @@ msgstr ""
 "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
 "vypnutá."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Povolit ESessions šifrování pro tento účet."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3745,91 +3685,91 @@ msgstr ""
 "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
 "vypnutá."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Spím"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Jím"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Právě pracuji."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Pracuji"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Venku"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3838,1074 +3778,1074 @@ msgstr ""
 "Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v "
 "muc_highlight_words, nebo když obsahuje Vaši přezdívku."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Přehraný zvuk při příchodu jakékoliv MUC zprávy."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Příjemce"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Diskuze"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Skupinová pozvánka"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Skupinová pozvánka"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Diskuze"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Diskuze"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Vytváření místností není povoleno."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Nová diskuze"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Tato služba nebyla nalezena"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Tohle není diskuze"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Účet Local už existuje."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Diskuze %s neexistuje."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Diskuze"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Domácí práce"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Nakupuji potraviny"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Uklízím"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Vařím"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Dělám údržbu"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Umývám nádobí"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Peru"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Zahradničím"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Vyřizuji"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Venčím psa"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "Piju"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Piju pivo"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Na kávě"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Dávám si čaj"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Svačím"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 #, fuzzy
 msgid "Having Breakfast"
 msgstr "Snídám"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Večeřím"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Obědvám"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Jedu na kole"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Tančím"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Na výšlapu"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Běhám"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Sportuji"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Běhám"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Lyžuji"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Plavu"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Posiluji"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Grooming"
 msgstr "Pečuji o sebe"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "V lázních"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "U holiče"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Holím se"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Koupu se"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Sprchuji se"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Mám schůzku"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Den volna"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Venku za zábavou"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Skrývám se"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Na dovolené"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Modlím se"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolená"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Přemýšlím"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 #, fuzzy
 msgid "Relaxing"
 msgstr "Relaxuji"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Rybařím"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Hraji hry"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "Venku"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Na párty"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Čtu si"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Nacvičuji"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Nakupuji"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Kouřím"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Ve společnosti"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Opaluji se"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Sleduji TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Dívám se na film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Povídám si"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "Ve skutečném světě"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Telefonuji"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Cestuji"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Dojíždím"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Řídím"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "V autě"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "V letadle"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Ve vlaku"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Na výletě"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Na procházce"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programuji"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "Na setkání"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Učím se"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Píši"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Vylekaný"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Užaslý"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Milující"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Rozzlobený"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Vzrušený"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Znuděný"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Statečný"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Klidný"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Opatrný"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Chladný"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Sebevědomý"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Zmatený"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Zamyšlený"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Spokojený"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Potrhlý"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Šílený"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Tvořivý"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Zvědavý"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Odmítnutý"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Deprimovaný"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Zklamaný"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Znechucený"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Zděšený"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Roztržitý"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Závidějící"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Nadšený"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Záletný"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "Frustrated"
 msgstr "Rozčarovaný"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Vděčný"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Truchlící"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Nevrlý"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Provinilý"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Šťastný"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Doufající"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Rozpálený"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Pokorný"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Ponížený"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Hladový"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Raněný"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "S respektem"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Zamilovaný"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Rozhořčený"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Zaujatý"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Opilý/Zfetovaný"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Nepřekonatelný"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Žárlivý"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Osamělý"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Ztracený"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Šťastný"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Nízký"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Náladový"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervózní"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Bez emocí"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Uražený"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Rozčílený"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Hravý"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Hrdý"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 #, fuzzy
 msgid "Relaxed"
 msgstr "Uvolněný"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "Uvolněný"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Kajícný"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Netrpělivý"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Smutný"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Jízlivý"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Spokojený"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Vážný"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Plachý"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Nemocný"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Ospalý"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontánní"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Stresovaný"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Silný"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Překvapený"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Děkovný"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Žíznivý"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Unavený"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Nedefinováno"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Slabý"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Ustaraný"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "výchozí"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "mariňák"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Skrývám se"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Země:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Účet"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Popis"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Chyba"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "jeden"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "místnost"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Nepodařilo se získat certifikát vydavatele"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Nepodařilo se získat certifikát CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodařilo se dešifrovat podpis certifikátu"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodařilo se dešifrovat podpis CRL certifikátu"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Nepodařilo se dešifrovat veřejný klíč vydavatele"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Chyba podpisu certifikátu"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Chyba podpisu CRL certifikátu"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Certifikát není správný"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL certifikát není správný"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "Platnost CRL certifikátu vypršela"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Chyba certifikátu v poli: platnost před"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Chyba certifikátu v poli: platnost po"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Chyba CRL certifikátu v poli: poslední aktualizace"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Chyba CRL certifikátu v poli: příští aktualizace"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Sám sebou podepsaný certifikát v certifikačním řetězci "
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodařilo se získat certifikát lokálního vydavatele"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Nepodařilo se ověřit první certifikát"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Certifikační řetězec je přiliš dlouhý"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certifikát je zrušený"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Překročena delká cesty"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Nepodporované osvědčení certifikátu"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certifikát je nedůvěryhodný"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certifikát odmítnut"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Neshoduje se název vydavatele"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Název klíče se neshoduje s Autoritou"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Vydavatelovo sériové číslo se neshoduje s Autoritou"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Použítý klíč neobsahuje podpis certifikátu"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certifikát je zrušený"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Neznámá SSL chyba: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorizace přijata"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "E2E Šifrování vypnuto"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Rozšíření není podporováno"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Autentizace selhala s \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4968,12 +4908,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Nastavení místnosti"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4985,225 +4925,195 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 #, fuzzy
 msgid "audio input"
 msgstr "audio vstup"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 #, fuzzy
 msgid "audio output"
 msgstr "audio výstup"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 #, fuzzy
 msgid "video input"
 msgstr "video vstup"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Neplatný znak v hostname."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Je potřeba adresa serveru."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Neplatný znak v uživatelském jméně."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Neplatný znak ve zdroji."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Nerušit"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Nedostupný"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Pryč"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Pryč"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Odpojen"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Příjemce"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Odesílatel"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Oboustranná"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Neznámý"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Účastníci"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Účastník"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Vlastník"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Vlastník"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Správce"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Správce"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Člen"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Člen"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "píše zprávu..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5211,22 +5121,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "v _diskuzích"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "od uživatele %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5234,51 +5144,40 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Chtěl(a) bych si Vás přidat do mého Seznamu."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 #, fuzzy
 msgid "Hello, I am $name."
 msgstr "Ahoj, já jsem $name"
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Obrázek je příliš veliký"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL certifikát není správný"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je soubor, ale měl by být adresář"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
@@ -5378,83 +5277,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Soubor je prázdný"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E Šifrování vypnuto"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Informace o změně stavu"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Změnit stav"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Nastav typ přítomnosti a popisek"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Ukecaný"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Připojen"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Dlouho pryč"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Nerušit"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Odpojený - odpojit"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Popis stavu: "
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Stav se změnil."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Odeslán kontakt: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Odeslány kontakty:"
 
@@ -5477,7 +5376,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Účet"
 
@@ -5488,7 +5387,7 @@ msgstr "Diskuze"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Heslo:"
@@ -5512,7 +5411,7 @@ msgstr "v _diskuzích"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Vstoupit"
@@ -5530,17 +5429,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Zrušit"
 
@@ -5686,7 +5585,7 @@ msgstr "Informace o kontaktu"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Popis"
 
@@ -5892,39 +5791,44 @@ msgstr "Práce"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Komentář"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Připojit se do diskuze"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Hned jsem zpět"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Vstoupit"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Odstraňuju účet %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5993,6 +5897,7 @@ msgid "Strike"
 msgstr "Přeškrtnout"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Barva"
 
@@ -6005,138 +5910,133 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Smazat formátování"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Vyber soubor k odeslání..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Zobraz seznam smajlíků (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Zakazuji..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Změ_nit přezdívku"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Změnit _předmět"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Zadejte heslo:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Opustit diskuzi"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Nastala chyba:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Ověřit znovu"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Účastník"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "Vy_kopnout"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Také můžete specifikovat náhradní místo:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Účastník"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Zakázat"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Nová diskuze"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Likviduji: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Také můžete specifikovat náhradní místo:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Důvod"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "_Pozvat do"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Událost"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Událost"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6234,20 +6134,20 @@ msgid "Add"
 msgstr "Přidat"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "Odst_ranit"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Zdroj:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Stav"
 
@@ -6257,7 +6157,7 @@ msgid "Client"
 msgstr "Klient:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Systému:</b>"
@@ -6403,38 +6303,39 @@ msgstr "Chování _okna"
 msgid "_Show contact list on startup"
 msgstr "Zobrazit _Seznam"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Spojit účty"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Zobrazovat a_vatary kontaktů v seznamu"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6443,12 +6344,12 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6457,53 +6358,53 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v "
 "okně Seznamu a v diskuzích"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Zobrazovat _nálady kontaktů v seznamu"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Seřadit podle stavu"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Odeslány kontakty:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "v _diskuzích"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Výměna položky rosteru"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Kontrola Pravopisu"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6515,29 +6416,29 @@ msgstr ""
 "nastavení jazyk přes pravé tlačítko na vstupním poli, tak se použije výchozí "
 "jazyk pro tento kontakt nebo diskuzi."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "Tělo zprávy"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Zobrazit seznam formátování"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6546,172 +6447,173 @@ msgstr ""
 "Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když "
 "kontakt změní jeho stav a/nebo jeho stavovou zprávu."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Registrace selhala"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Poslední stav: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Rozhovory"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Notification-daemon"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Když je přijata nová zpráva"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorni mě na kontakty které se přihlásí"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorni mě na kontakty které se odhlásí"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Vizuální upozornění</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Sp_ravovat..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Povolit zvuk, když jsem zaneprázněn"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Waw soubory"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Nedostupný"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6720,7 +6622,7 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim změní stav na 'Nedostupný' pokud se počítač "
 "nepoužívá delší dobu"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6729,7 +6631,7 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim změní stav na 'Nedostupný' pokud se počítač "
 "nepoužívá delší dobu"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6742,7 +6644,7 @@ msgstr ""
 "$S se nahradí za předchozí popis stavu\n"
 "$T se nahradí dobou nečinnosti před zapnutím stavu Pryč"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6755,40 +6657,40 @@ msgstr ""
 "$S se nahradí za předchozí popis stavu\n"
 "$T se nahradí dobou nečinnosti před zapnutím stavu Nedostupný"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutách"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatický stav"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Ptej se na stav při:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6796,68 +6698,68 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim se nebude pokáždé ptát na zprávu stavu. Místo toho "
 "použije výchozí nadefinovanou zprávu."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Výchozí Zpráva"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Povolit"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Text stavu"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Přednastavené stavy</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Téma"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Téma"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Nastav barvu a písmo uživatelského rozhraní"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Výchozí _ikony stavů:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Používat ikony _transportů"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6867,123 +6769,133 @@ msgstr ""
 "z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
 "atd...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Styl"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Vlastnosti serveru"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Audio výstupní zařízení"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Audio vstupní zařízení"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Audio / Video"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Velikost videa"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Video vstupní zařízení"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "video výstup"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Velikost videa"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Spojení"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Server:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Audio / Video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Spravovat..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Příslušenství</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Otevřít..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Editor rozšířeného nastavení"
@@ -7167,12 +7079,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Zadejte heslo:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Pokročilé akce"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Použít vlastní jméno počítače/port"
@@ -7258,7 +7170,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Přihlásí"
@@ -7272,7 +7184,7 @@ msgstr "Vytvořte vaše nové téma."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7302,8 +7214,8 @@ msgstr "_Vrátit k výchozím barvám"
 msgid "Resets value to default"
 msgstr "_Vrátit k výchozím barvám"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Počítač: "
@@ -7347,7 +7259,7 @@ msgstr "Sám sebou podepsaný certifikát"
 msgid "Proxy Host"
 msgstr "P_očítač Proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Typ"
 
@@ -7361,8 +7273,7 @@ msgstr "P_rotokol:"
 msgid "Copy info to clipboard"
 msgstr "_Kopírovat odkaz"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Vlastnosti serveru"
 
@@ -7548,6 +7459,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Z_měnit popis stavu"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Nálada:</b>"
@@ -7624,8 +7540,8 @@ msgstr "Stagnuje"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7815,80 +7731,106 @@ msgstr "Registrace selhala"
 msgid "_Name"
 msgstr "_Jméno: "
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Začít rozhovor"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Opustit diskuzi"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Správce historie"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "P_luginy"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Nastavení"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Konec"
+msgid "_Accounts"
+msgstr "Účty"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Zobraz"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Zobrazit pouze _aktivní kontakty"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Zobrazit pouze _aktivní kontakty"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Zobrazuj trans_porty"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML Konzole"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Přenosy souborů"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Nápověda"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Připojen"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Připojen"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Vlastnosti serveru"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Komentář"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7903,6 +7845,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Opustit diskuzi"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8189,60 +8136,68 @@ msgstr "Výměna položky rosteru"
 msgid "Create new group chat"
 msgstr "Opustit diskuzi"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Přenosy souborů"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "text stavu"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Zobrazit _XML konzoli"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Vzhled diskuze</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Zobrazit pouze _aktivní kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Zobrazit pouze _aktivní kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Informace o kontaktu"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Odeslány kontakty:"
@@ -8319,12 +8274,16 @@ msgstr "Vyplňte formulář."
 msgid "Group Chat Configuration"
 msgstr "Skupinová pozvánka"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML Konzole"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Začít rozhovor"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filtr:"
@@ -8370,11 +8329,6 @@ msgstr "Zobrazit všechny čekající _události"
 msgid "Mute Sounds"
 msgstr "Vypnout zvuky"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Nastavení"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8696,124 +8650,124 @@ msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Diskuze"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Diskuze"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Místnost nemá žádné téma"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Diskuze"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Diskuze"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Diskuze"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Skupinová pozvánka"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Sezení NEBUDE logováno"
@@ -8842,7 +8796,7 @@ msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Příjemce: "
 
@@ -8994,7 +8948,7 @@ msgstr "Soubor: "
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Odesílatel: "
 
@@ -9009,7 +8963,7 @@ msgid "Change"
 msgstr "Změ_nit přezdívku"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Hned jsem zpět"
@@ -9040,11 +8994,12 @@ msgid "Password Change Failed"
 msgstr "Vyžadováno heslo"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Nastala chyba při vytváření účtu"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Změnit heslo"
 
@@ -9081,40 +9036,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Neznámá SSL chyba: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Pokračování v rozhovoru"
+msgid "Start / Join Chat"
+msgstr "Začít rozhovor"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "Přid_at kontakt..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s nebyl nalezen"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9123,33 +9073,33 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Ostatní"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Diskuze"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9157,142 +9107,142 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žádné položky, které je možné prohlížet."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Neplatné jméno serveru"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Procházím %(address)s pomocí účtu %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Prohlížet"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Tato služba neobsahuje žádné položky, které je možno prohlížet."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Příkazy: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Najít"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Úpravy"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skenuji %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Uživatelé"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "č."
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Uzel"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nový záznam"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "předmět"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Znak nebyl povolen"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Není možné poslat zprávu kontaktu %s, takové JID není platné."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
@@ -9338,91 +9288,75 @@ msgstr "Registrace úspěšná"
 msgid "Registration failed"
 msgstr "Registrace selhala"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Slovník pro jazyk %s není dostupný"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
-"jazyk nastavením volby speller_language."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "pro účet %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG číslo: "
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Skupinová pozvánka"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
@@ -9437,6 +9371,11 @@ msgstr "GG číslo: "
 msgid "ICQ Number"
 msgstr "ICQ číslo: "
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "Přid_at kontakt..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9492,7 +9431,7 @@ msgstr "Chyba při přidávání služby. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9655,43 +9594,63 @@ msgstr "Kontakt se odpojil"
 msgid "Contact Connected Background "
 msgstr "Kontakt se připojil"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Text stavu"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Text stavu"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Text stavu"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Text stavu"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Neplatné uživatelské jméno"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Znak nebyl povolen"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Vážně chcete smazat vybranou zprávu?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Toto jméno je již použito. Chcete přepsat text stavu?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktivní"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Registrace selhala"
@@ -9715,10 +9674,9 @@ msgid "Error: %s"
 msgstr "Chyba: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Chyba"
 
@@ -9732,48 +9690,48 @@ msgstr "Stav je nyní %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stav je nyní %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Uklízím"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Spravovat profily Proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "N_astavit podle stavu"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Odpojen"
@@ -9794,7 +9752,7 @@ msgstr "Účet"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Váš účet byl úspěšně vytvořen"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9826,60 +9784,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Synchronizovat"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Připojuji se"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Přeposlat nepřečtené zprávy"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber klient"
@@ -9940,127 +9903,127 @@ msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Vyber soubor k odeslání..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Vyberte obrázek"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Všechny soubory"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Všechny soubory"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Odeslat _Soubor"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Obrázky"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vyberte obrázek"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Všechny soubory"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Uložit jako..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s této diskuze"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Spojeno"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Odpojenol"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Soubor: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Stáhnout"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Nahrát"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Přenos souboru zastaven"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Popis:"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Pozastaveno"
@@ -10069,7 +10032,7 @@ msgstr "?transfer status:Pozastaveno"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Neplatný soubor"
@@ -10125,26 +10088,26 @@ msgstr "Zvýraznění zprávy v diskuzi"
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Vyžadováno heslo"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Ano"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Žádný"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Zrušit"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10163,11 +10126,6 @@ msgstr "pomocí účtu %s"
 msgid "Hide _Contact List"
 msgstr "Pozvat kontakt"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Zobrazit pouze _aktivní kontakty"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
@@ -10216,36 +10174,31 @@ msgid ""
 msgstr ""
 "Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Nastavení"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Nastavení"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Nejste připojen(a) k serveru"
+msgid "Archiving Preferences Error"
+msgstr "_Nastavení"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Chyba v příchozím datagramu"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Nastavení"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktivní"
@@ -10294,81 +10247,81 @@ msgstr "?Ask (for Subscription):Není"
 msgid "?password:Hidden"
 msgstr "Heslo:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Nastavení"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Audio / Video"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Schopnost zahájit audio a video rozhovor."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Vlastnost není k dispozici pod Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr "Funkce pro měření času nečinnosti pro nastavení automatického stavu."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Vyžaduje knihovnu libxss."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10376,101 +10329,101 @@ msgid ""
 msgstr ""
 "Serverless automaticky komunikuje s klienty detekovanými v místní síti."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Je potřeba python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Je potřeba gpg a python-GnuPGInterface."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Spojení"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Vyžaduje libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Vlastnost není k dispozici pod Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Upozornění"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Schopnost zahájit audio a video rozhovor."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Je potřeba python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Uložit heslo"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Heslo může být bezpečně uloženo."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Je potřeba gnome-keyring a python-gnome2-desktop, nebo kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Kontrola Pravopisu"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Vyžaduje libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Je potřeba python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Nastavení"
@@ -10516,7 +10469,7 @@ msgstr "Neplatné jméno seznamu"
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte zadat jméno pro vytvoření privacy listu."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Pozvat kontakt"
@@ -10544,7 +10497,7 @@ msgstr "_Dokončit"
 msgid "Commands"
 msgstr "Příkazy: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10617,118 +10570,132 @@ msgstr "Žádost o autorizaci od %s"
 msgid "Loading"
 msgstr "Programuji"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Spojeno"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Odstraňuju účet %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Klikněte pro změnu hesla k účtu"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Připojuji se"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Váš server nepodporuje vizitky."
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Znak nebyl povolen"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Váš server nepodporuje vizitky."
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "Přid_at kontakt..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Vytvoř nový zápis"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Vlastní port musí být číslo portu."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Pokročilé akce"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Zakazuji %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Neznámá SSL chyba: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Odstraňuju účet %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registrovat k %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Účet"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Účty"
@@ -10771,249 +10738,253 @@ msgstr "Najít"
 msgid "No results found"
 msgstr "Žádný výsledek"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Výchozí"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "text stavu"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Připojit se teď znovu?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Připojit se teď znovu?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Neplatný účtu"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Neplatný účtu"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 #, fuzzy
 msgid "Label"
 msgstr "označit"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Pozvat kontakt"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Sám sebou podepsaný certifikát"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Připojit po startu Gajimu"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Uložit _historii pro všechny kontakty"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Všechny stavy"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Změní stav účtu nebo účtů"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Použij proxy při přenosu souborů"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " od %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Pozvat kontakt"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_ta:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_použít proměnnou prostředí HTTP_PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Změní stav účtu nebo účtů"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Křestní:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Příjmení:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Nový E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "N_astavit podle stavu"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Povolit"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Spojení"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Sám sebou podepsaný certifikát"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Uložit heslo"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registrace selhala"
@@ -11070,19 +11041,19 @@ msgstr[0] "Odstraněno %s kontaktů"
 msgstr[1] "Odstraněno %s kontaktů"
 msgstr[2] "Odstraněno %s kontaktů"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Neznámý Umělec"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Neznámý Název"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Neznámý Zdroj"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11096,22 +11067,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Záložky"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Soubor je prázdný"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Služba odeslala chybné data"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11169,127 +11140,237 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Zobrazit všechny čekající _události"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Vlastnosti serveru"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Kontrola Pravopisu psaných zpráv."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontakty"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Diskuze"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Nedávno:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Registrace selhala"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Pokračování v rozhovoru"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Neznámá SSL chyba: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Slovník pro jazyk %s není dostupný"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat "
+#~ "jiný jazyk nastavením volby speller_language."
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Znovu připojit"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Konec"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Zobrazit pouze _aktivní kontakty"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "Přid_at kontakt..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Pozvat kontakt"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Opustit diskuzi"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Nová diskuze"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
+#~ "zprávy. V závislosti na tématu, tato ikona může být animovaná."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Neplatný znak v hostname."
+
+#~ msgid "Server address required."
+#~ msgstr "Je potřeba adresa serveru."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Neplatný znak v uživatelském jméně."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Neplatný znak ve zdroji."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Upozorni mě na kontakty které se přihlásí"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Upozorni mě na kontakty které se odhlásí"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Upozornit mě po dokončení přenosu souboru"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Upozornit mě po dokončení přenosu souboru"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Událost"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Událost"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Nejste připojen(a) k serveru"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Konflikt Zdrojů"
 
@@ -11933,9 +12014,6 @@ msgstr "Registrace selhala"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Odeslat soukromou zprávu"
 
-#~ msgid "Send _File"
-#~ msgstr "Odeslat _Soubor"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Účastníci"
@@ -14665,9 +14743,6 @@ msgstr "Registrace selhala"
 #~ "můžeš si zvolit jiný.\n"
 #~ "Můžeš také zvážit změnu nastavení firewallu."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Spojit účty"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP na tomto počítači není použitelné"
 
@@ -15006,10 +15081,6 @@ msgstr "Registrace selhala"
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, A_vatar"
 
-#, fuzzy
-#~ msgid "P_lugins"
-#~ msgstr "P_luginy"
-
 #~ msgid "File _Transfers"
 #~ msgstr "_Přenosy souborů"
 
@@ -15171,9 +15242,6 @@ msgstr "Registrace selhala"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Je potřeba python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Je potřeba gnome-keyring a python-gnome2-desktop, nebo kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/da.po b/po/da.po
index 936bc2117..b744ec477 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-11-18 19:33+0100\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
 "Language-Team:  <>\n"
@@ -18,73 +18,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Emacs 22.1.50.1, po-mode 2.02+0.4\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Konti"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "og godkendt"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "og IKKE godkendt"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale session %(logged)s blive logget."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Fortryd"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Ryd"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "Indsæt som citat"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "Vælg billede"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr "Du er ved at indsætte et billede"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 "Er du sikker på at du vil indsætte billedet i din udklipsholder i "
 "chatvinduet ? "
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "_Spørg mig ikke igen"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "Privatliv"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Advarsel"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "Hvis du sender en fil til <b>%s</b>, vil dit Jabber ID blive afsløret."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Fortsæt"
 
@@ -153,502 +159,497 @@ msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Vis _Afkoblede Kontakter"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Jeg vil gerne tilføje dig til min kontakt liste."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Send en Enkel _Besked"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Kør Kommando"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "Hå_ndter Transport"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Omdøb"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Fjern blokering"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloker"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Send _Fil"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Gem Fil som..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Gem Fil som..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Sidste status: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Tilføj Kontakt..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Lyd / Billede"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Historie"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Ikke aktiveret"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Komponere"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Status For Alle"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Inviter _Kontakter"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Forlad Gruppesamtaler"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Forlad Gruppesamtaler"
+msgid "Rename…"
+msgstr "_Omdøb"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Ændre _Emne..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Forlad Gruppesamtaler"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Vælg Billede"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Ny Gruppe Samtale"
+msgid "Configure…"
+msgstr "_Konfigurere"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Fjern %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Tilslutning fejlede"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Log status ændringer hos kontakter"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Forvalgte beskeder:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Minimer ved lukning"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Minimer ved Automatisk Deltagelse"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Ændre _Kælenavn..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Stemme"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Kør Kommando"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dage siden"
 msgstr[1] "%i dage siden"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Komponere"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Status For Alle"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Tilføj Kontakt..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "fil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Send en Enkel _Besked"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "Op_dag Tjenester"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Indstillinger"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Liste over bandlyste"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Bogmærke"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Rum Konfigurering"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Synkroniser"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Administrator"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Send Server Besked..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Sæt MOTD..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Opdater MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Slet MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Tilføj Kontakt..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Ændre Konto"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Ændre Konto"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Konti"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Tilføj Kontakt..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopier Henvisning"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Åbn Henvisning i Netlæser"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Åbn E-post Program"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopier Henvisning"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Påmindelse"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "In_viter"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Fjern blokering"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Bloker"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Kast ud"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Udvis"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Ejer"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Administrator"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Medlem"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Medlem"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Stemme"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Rum JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "besked"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Føl_elsesikoner:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finde historik log databasen"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Filen eksisterer ikke"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM Adresse:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -656,29 +657,29 @@ msgstr "Dato"
 msgid "Nickname"
 msgstr "Kælenavn"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Besked"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Emne"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Database Fejl"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "opretter log database"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -691,281 +692,286 @@ msgstr ""
 "\n"
 "I tilfælde du trykker JA, venligst vent..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Ryd _op"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Du"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s klokken %(time)s sagde: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Slet"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Annuller bekræftelse"
 msgstr[1] "Annuller bekræftelse"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Vil du virkelig slette den valgte besked?"
 msgstr[1] "Vil du virkelig slette den valgte besked?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Standard Besked"
 msgstr[1] "Standard Besked"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Vil du virkelig slette den valgte besked?"
 msgstr[1] "Vil du virkelig slette de valgte beskeder?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "General"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Gruppe"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "I gruppen"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Sæt Humørstemning"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ingen"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Besked"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Status Besked"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Besked?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Dette navn er allerede i brug. Vil du overskrive denne status besked?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Status Besked"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Gem som Forvalgt..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Skriv et navn for denne status besked"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Har"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan kun synkronisere dine kontakter når du er tilsluttet."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Navn"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan kun synkronisere med en konto hvis du er tilsluttet."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Send _Fil"
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Send fil (max %s MiB)"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Filoverførsler"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Ugyldig Fil"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Sparker %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr "Blokeret %s"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick) har sat emnet til %(subject)"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Session VIL IKKE blive logget"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Information om dig, som er gemt på serveren"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Rummet er nu ikke-anonymt"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Rummet er nu semi-anonymt"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Rummet er nu helt anonymt"
@@ -980,7 +986,7 @@ msgstr "Pong! (%s .s)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s .s)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Fejl."
 
@@ -1009,22 +1015,22 @@ msgstr "Et nyt rum er blevet oprettet"
 msgid "Failed to Configure Group Chat"
 msgstr "Forlad Gruppesamtaler"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s er nu kendt som %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Du er nu kendt som %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s er nu %(status)s"
@@ -1153,81 +1159,81 @@ msgid "If you close this window, you will leave '%s'."
 msgstr ""
 "Hvis du lukker dette vindue vil du blive frakoblet fra denne gruppe samtale."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Hvis en liste over følelsesikoner"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Denne kontakt understøtter ikke fil overførsler."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s .s)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Send & Luk"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Ny Besked"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Send & Luk"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1236,188 +1242,179 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s er nu %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Filoverførsler"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Størrelse: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "K_ontoer"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Afkoblet"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Åbn folderen med filen"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Den fjerne kontakt stoppede filoverførslen"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Fejl ved åbning af fil"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Filoverførsel stoppede"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Filoverførsel er afbrudt"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Tilslutning til ligeværdige kan ikke oprettes."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Vis hændelse i kontaktvindue"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avanceret Konfigurations Behandler"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rum Konfigurering"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Vis Alle Ventende Hænd_elser"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Popper op et vindue ved næste hændelse"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Start Samtale"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Flettede konti"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Gruppesamtaler"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nu vil %s vide din status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Hvis %s accepterer denne forespørsel vil du kunne se hans eller hendes "
 "status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
@@ -1427,7 +1424,7 @@ msgstr "Nu vil %s altid se dig som offline."
 msgid "desynced"
 msgstr "ikke synkroniseret"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1447,7 +1444,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Altid afslut Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Afslut"
@@ -1604,8 +1602,8 @@ msgstr "Omdøb Gruppe"
 msgid "Please enter a new name"
 msgstr "Opret et nyt tema med dit ønskede navn."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Om_døb"
@@ -1624,27 +1622,32 @@ msgstr "Vil du fjerne gruppen %s fra kontaktvinduet?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Fjern også alle kontakter i denne gruppe fra kontaktvinduet"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Forlad Gruppesamtaler"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Omdøb Kontakt"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Du er ved at fjerne \"%(name)s\" (%(jid)s) fra dit kontaktvindue.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1654,21 +1657,21 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Jeg vil at denne kontakt kan se min status efter den er blevet fjernet"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1680,25 +1683,25 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Omdøb Kontakt"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Du må oprette en konto før du kan begynde en samtale med andre kontakter."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1708,12 +1711,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1723,122 +1726,123 @@ msgstr ""
 "Metakontakter er en måde at gruppere flere kontakter på en linie. Oftest "
 "bruges det når den samme person har flere Jabber eller transport konti."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Omdøb Kontakt"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativ"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Vil du sende denne fil til %s:"
 msgstr[1] "Vil du sende disse filer til %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Send"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s til %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Lav %s og %s til metakontakter"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Lav %s og %s til metakontakter"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicer Melodi"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Ændre _Grupper"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Om_døb"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Tilslut igen"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "_Kør Kommando"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historie"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Iagttagere"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1967,70 +1971,70 @@ msgstr "Private Samtaler"
 msgid "Messages"
 msgstr "Beskeder"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisering for %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Accepterer du denne forespørsel?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Godkendelse er blevet sendt"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Godkendelse er blevet sendt"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ingen"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Abonnement forespørgsel"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Kontakten \"%s\" har godkendt dig til at se hans eller hendes status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Abonnement Forespørgsel"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2039,150 +2043,150 @@ msgstr ""
 "Du vil altid se ham eller hende som offline.\n"
 "Vil du fjerne ham eller hende fra din kontakt liste?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Frameldt abonnement"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikatet er udløbet"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Den fjerne kontakt stoppede filoverførslen"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Fejl ved åbning af fil"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL certifikat fejl"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Filoverførsler"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Ikke sikker forbindelse"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2193,20 +2197,20 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Tilslutter"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2410,11 +2414,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard publicering fejlede"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2747,78 +2751,73 @@ msgstr ""
 "Argument \"%(arg)s\" er ikke specificeret. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er et katalog men burde være en fil"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Fjern %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Ukendt SSL fejl: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Ny Privat Besked"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Ny Besked fra %(nickname)s"
 msgstr[1] "Ny Besked fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Ny Gruppe Samtale"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Ændrede Status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nu %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggede Ind"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggede Ud"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Godkendelse fejlede med \"%s\""
@@ -2895,65 +2894,23 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Påmind mig om kontakter logger _ind"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Påmind mig om kontakter som logger u_d"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Påmind mig når en filoverførsel er færdig"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Påmind mig når en filoverførsel er færdig"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Baggrundsfarve på kontakter når de netop har tilsluttet sig."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Liste (separeret med mellemrum) af rækker (konti og grupper) som er "
 "kollapset."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "standard"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Sprog brugt af stavelseskontrollen"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2963,15 +2920,15 @@ msgstr ""
 "'nogen ganger' - skriv tid for hver print_ichat_every_foo_minutes minutter.\n"
 "'aldrig' - skriv aldrig tiden."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings tegn."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2980,7 +2937,7 @@ msgstr ""
 "Hvis sandt, ikke fjern */_. Således at *abc* bliver skrevet med fed skrift "
 "men * * bliver ikke fjernet."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2989,7 +2946,7 @@ msgstr ""
 "Tegn som tilføjes efter kælenavn når der bruges kælenavnsfuldførelse (tab) i "
 "en gruppesamtale."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2998,17 +2955,17 @@ msgstr ""
 "Tegnforslag til at tilføje efter det ønskede kælenavn, når det ønskede "
 "kælenavn er i brug af en anden i gruppesamtalen."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3021,22 +2978,22 @@ msgstr ""
 "[timer:minutter]. Se python dokumentationen for strftime: http://docs.python."
 "org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Tegn som bliver skrevet før kælenavnet i samtaler"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Tegn som bliver skrevet efter kælenavnet i samtaler"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr "Hvis valgt vil Gajim vise kontakternes humør i kontaktvinduet"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3045,12 +3002,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindue/"
 "faneblad genåbnes."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3060,19 +3017,19 @@ msgstr ""
 "forbindelse til en konference som du er blevet afbrudt fra. Sæt værdien til "
 "0 for at forhindre at der prøves at oprette ny forbindelse."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Send besked med Ctrl+Enter og lave en ny linie med Enter (standard Mirabilis "
 "ICQ klient adfærd)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Hvor mange linjer skal gemmes for Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3081,12 +3038,12 @@ msgstr ""
 "Enten en tilpasset url som indeholder %s hvor %s er ordet/frasen, eller "
 "'WIKTIONARY' som betyder brug wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Hvis valgt kan Gajim blive kontrolleret eksternt ved hjælp af gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3095,15 +3052,15 @@ msgstr ""
 "Når der ikke skrives tid for hver besked (print_time==sometimes), skriv "
 "tiden for hver x minutter."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spørg før et gruppesamtale vindue/faneblad lukkes."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3112,7 +3069,7 @@ msgstr ""
 "Spørg før et faneblad i samtale vinduet lukkes hvis der kan mistes dat "
 "(samtale, privat samtale, gruppe samtale som ikke vil minimere)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3122,32 +3079,32 @@ msgstr ""
 "grænseflader, for filoverførsler i tilfælde af adresse omskrivning/port "
 "videresending."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard siger KiB = 1024 byte, KB = 1000 byte."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Vis påmindelse af hændelser i statusfelt ikonet."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis faneblade i samtalevinduer?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Vis lukke knap i faneblad?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3155,7 +3112,7 @@ msgid ""
 msgstr ""
 "En semikolon-separeret liste af ord som vil blive fremhævet i gruppesamtaler."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3165,22 +3122,13 @@ msgstr ""
 "Hvis Sandt, lukker Gajim når X knappen fra vindueshåndteringen klikkes. "
 "Denne indstilling tages der kun hensyn til hvis et statusfelt ikon bruges."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Hvis Sandt, vil Gajim vise et ikon på hvert faneblad som indeholder ulæste "
-"beskeder. Afhængig af temaet, kan dette ikon være animeret."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3189,14 +3137,14 @@ msgstr ""
 "Hvis Sandt, vil Gajim vise status beskeder, hvis ikke tomme, for hver "
 "kontakt under kontaktnavnet i kontaktvinduet."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Definer positionen af avataren i kontaktvinduet. Kan være venstre eller højre"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3206,26 +3154,26 @@ msgstr ""
 "kontakt ændrer hans eller hendes status og/eller hans eller hendes status "
 "besked."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Ikke hvis kontaktvindue i vindueslisten."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3235,7 +3183,7 @@ msgstr ""
 "vinduet (standard adfærd i de fleste vindueshåndterere) når det indeholder "
 "ventende begivenheder."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3257,7 +3205,7 @@ msgstr ""
 "'pertype' - Hver besked type (for eks. samtaler versus gruppesamtaler) "
 "bliver sendt til et specifikt vindue."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3265,32 +3213,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Hvis Falsk vil du ikke længere se en avatar i samtale vinduet."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Hvis Sandt vil tryk på escape tasten lukke et vindue/faneblad."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Skjuler banneret i et gruppesamtale vindue"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Skjuler banneret i et gruppesamtale vindue"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Skjuler gruppesamtale deltagerlisten i gruppesamtale vinduer."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3299,18 +3247,18 @@ msgstr ""
 "I en samtale, vis kælenavn i begyndelsen af en linie kun når det ikke er den "
 "samme person som snakker som i forrige besked."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indrykning når man fletter ens kælenavne."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab gå til næste faneblad når ingen er ulæste."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3319,7 +3267,7 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for blokering af kontakter? Tom streng "
 "betyder at vi aldrig viser vinduet."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3328,7 +3276,7 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for blokering af kontakter? Tom streng "
 "betyder at vi aldrig viser vinduet."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3339,7 +3287,7 @@ msgstr ""
 "konto i kontoændrings vinduet. VÆR FORSIGTIG, når du er logget med en "
 "negativ prioritet vil du IKKE modtage nogen beskeder fra din server."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3348,7 +3296,7 @@ msgstr ""
 "Hvis Sandt vil Gajim vise antallet af online og totale kontakter i konto og "
 "gruppe rækker."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3357,12 +3305,12 @@ msgstr ""
 "Hvis Sandt vil Gajim rulle ned/op og vælge den kontakt som sendte dig den "
 "sidste besked, hvis ikke allerede kontaktvinduet er åbent."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Tid med inaktivitet der skal gå før vinduet til at ændre status lukkes."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3370,11 +3318,7 @@ msgstr ""
 "Maksimum antal linjer som bliver skrevet i samtaler. De ældste linjer bliver "
 "slettet."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Vælg interval mellem 2 kontroller for ingen aktivitet."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3383,7 +3327,7 @@ msgstr ""
 "Gyldige uri skemaer. Kun skemaer i denne liste vil blive accepteret som "
 "\"rigtige\" uri. (mailto og xmpp bliver behandlet separat)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3391,51 +3335,51 @@ msgstr ""
 "Hvis sandt, vil færdiggørelse i gruppe samtaler fungere på samme måde som "
 "færdiggørelse i kommandolinjen"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3444,11 +3388,7 @@ msgstr ""
 "Hvis aktiveret vil Gajim i spørge for en status besked. Den valgte standard "
 "besked vil blive brugt i stedet."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3456,37 +3396,37 @@ msgstr ""
 "Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
 "konto adgangskoder."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3494,7 +3434,7 @@ msgid ""
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3502,7 +3442,7 @@ msgid ""
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3510,7 +3450,7 @@ msgid ""
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3519,7 +3459,7 @@ msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3528,28 +3468,32 @@ msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Bogmærk dette rom"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3558,7 +3502,7 @@ msgstr ""
 "Prioriteten vil ændres automatisk ifølge din status. Prioriteter er "
 "defineret i autopriority_* indstillingerne."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3569,12 +3513,12 @@ msgstr ""
 "væk, ikke tilgængelig, vil ikke forstyrres, usynlig. NOTE: denne "
 "valgmulighed bliver kun brugt hvis restore_last_status er deaktiveret"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Hvis valgt, gendan den sidste status som var brugt."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
@@ -3582,7 +3526,7 @@ msgstr ""
 "Hvis sandt, kontakter som beder om autorisering vil automatisk blive "
 "accepteret."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3591,12 +3535,12 @@ msgstr ""
 "Hvis Falsk vil denne konto blive deaktiveret og vil ikke vises i "
 "kontaktvinduet."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3605,22 +3549,22 @@ msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3629,7 +3573,7 @@ msgstr ""
 "Hvor mange sekunder skal der ventes på svaret af en holdilive pakke, før vi "
 "prøver at forbinde igen."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3638,37 +3582,37 @@ msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Hvis aktiveret vil Gajim i spørge for en status besked. Den valgte standard "
 "besked vil blive brugt i stedet."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Fyld ind data for den kontakt som du vil tilføje"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3677,28 +3621,24 @@ msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "SSL certifikat fejl"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3707,41 +3647,41 @@ msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Aktiver ESessions kryptering for denne konto."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3750,91 +3690,91 @@ msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Spiser"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Jeg arbejder."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Arbejder"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Ude"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3844,1060 +3784,1060 @@ msgstr ""
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Lyd som spilles når en hvilken som helst MUC besked ankommer."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Til"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fejl: kan ikke åbne %s for læsning"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Gruppesamtaler"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Gruppesamtale Invitation"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Gruppesamtale Invitation"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Gruppe Chat"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Gruppesamtaler"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Gruppesamtale oprettelse er begrænset."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Ny Gruppe Samtale"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Tjenesten findes ikke"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Den Lokale Konto eksisterer allerede."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Gruppesamtaler"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Laver Husarbejde"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Køber ind"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Gør Rent"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Laver Mad"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Gør Vedligeholdsarbejde"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Vasker op"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Vasker Tøj"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Laver Havearbejde"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Løber et Ærinde"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Går tur med hunden"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Drikker"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Drikker en Øl"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Drikke Kaffe"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Drikker Te"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Spiser et lille Mellemmåltid"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Spiser Morgenmad"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Spiser Frokost"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Træner"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Cykler"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Danser"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Vandrer"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Jogger"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Dyrker Sport"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Løber"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Står på ski"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Træner"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Plejer"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "I Spabad"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Børster Tænder"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Bliver Klippet"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Barberer"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Tager et Bad"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Tager et Brusebad"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Har en Aftale"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Ikke aktiv"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Fridag"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Hænge ud"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Skjult"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Få Ferie"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Ber"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Planlagt Ferie"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Tænker"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Slapper af"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Fisker"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Spiller"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Går ud"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Fester"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Læser"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Køber ind"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Ryger"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Socialiserer"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Solbader"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Ser TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Ser en film."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Taler"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "I det virkelige liv"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Snakker i telefon."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Taler i Video Telefon"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Rejser"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Pendler"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Kører"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "I en Bil"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "På en Bus"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "Flyver"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Kører i tog"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "På Rejse"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Går"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Koder"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "I et Møde"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Studerer"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Skriver"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Bange for"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Forbavset"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Erotisk"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Gal"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Misfornøjet"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Ængstelig"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Vækket"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Skamfuld"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Keder mig"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Modig"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Rolig"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Forsigtig"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Fryser"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Sikker"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Forvirret"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Dybsindig"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Tilfreds"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Forskruet"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Vanvittig"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Kreativ"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Nysgerrig"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Nedslået"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Deprimeret"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Væmmes"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Forfærdet"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Forstyrret"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Misundelig"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Spændt"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Flirtende"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustreret"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Taknemlig"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Sørge"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Gnaven"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Glad"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Håbefuld"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Varm"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Ydmyg"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Ydmyget"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Sulten"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Såret"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Imponeret"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Ærefrygt"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Forelsket"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Indigneret"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Interesseret"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Uovervindelig"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Ensom"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Tabt"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Heldig"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Ondskabsfuld"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Gnaven"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervøs"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Oprørt"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Spøgefuld"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Stolt"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Afslappet"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Lettet"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Hvileløs"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Trist"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Tilfreds"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Seriøs"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Sjokeret"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Genert"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Syg"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Stresset"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Stærk"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Taknemlig"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Tørstig"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Træt"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Uforklaret"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Svag"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Bekymret"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "standard"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "marint"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Skjult"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Konto"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Beskrivelse"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Fejl"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "en"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "rum"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til at skaffer udstedelses certifikat"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til at skaffe certifikat CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til at dekryptere certifikatets signatur"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til at dekryptere CRL's signatur"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Ikke i stand til at dekode udstederens offentlige nøgle"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Certifikat signaturen fejlede"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "CRL signatur fejl"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfejl i certifikatets notBefore felt"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfejl i certifikatets notAfter felt"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfejl i CRL's lastUpdate felt"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfejl i CRL's nextUpdate felt"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsigneret certifikat i certifikats kæden"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Ikke i stand til at skaffe lokalt udstedelses certifikat"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Ikke i stand til at verificere det første certifikat"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Certifikat kæde er for lang"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA certifikat"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Sti længde begrænsning overskredet"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Ikke understøttet formål for certifikatet"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certifikatet er ikke til at stole på"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certifikatet afvist"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Emne udsteder uoverensstemmelse"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne nøgle identifikations uoverensstemmelse"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og udstedelses serie nummer uoverensstemmelse"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Nøglebrug indeholder ikke certifikat signering"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Ukendt SSL fejl: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorisering accepteret"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Certifikatet er udløbet"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Abonnement forespørgsel"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Udvidelse er ikke understøttet"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4959,12 +4899,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rum Konfigurering"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4976,294 +4916,253 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Ugyldig karakter i værtsnavn."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Server adresse påkrævet."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Ugyldig karakter i brugernavn."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Ugyldig karakter i ressource."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Travlt"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Ikke Tilgængelig"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Væk"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Borte"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Afkoblet"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukendt"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har fejl"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Intet"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Til"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Fra"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Begge"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Ukendt"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Intet"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Deltagere"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Deltager"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Ejer"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Ejer"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "komponerer en besked..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d besked venter"
 msgstr[1] "%d beskeder venter"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "i _gruppe samtaler"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "fra bruger %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " fra %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hændelse venter"
 msgstr[1] "%d hændelser venter"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil gerne tilføje dig til min kontakt liste."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Billede er for stort"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil, men burde være et katalog"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim vil nu slutte"
 
@@ -5366,83 +5265,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Ændre status information"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Ændre status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Sæt tilstedeværelses type og beskrivelse"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Åben for samtaler"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Online"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Udvidet borte"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Forstyr ikke"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Ofline - ikke tilsluttet"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Din status er blevet ændret."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Sendte kontakter:"
 
@@ -5465,7 +5364,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Konto"
 
@@ -5476,7 +5375,7 @@ msgstr "Gruppesamtaler"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Adgangskode:"
@@ -5500,7 +5399,7 @@ msgstr "i _gruppe samtaler"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Bliv med:"
@@ -5518,17 +5417,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Afbryd"
 
@@ -5676,7 +5575,7 @@ msgstr "Kontakt Information"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -5881,39 +5780,44 @@ msgstr "Arbejde"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Om"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Snart tilbage"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Bliv med:"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5982,6 +5886,7 @@ msgid "Strike"
 msgstr "Streg"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Farve"
 
@@ -5994,138 +5899,133 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Fjern formatering"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Vælg en Fil at Sende..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Hvis en liste over følelsesikoner (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Bandlysning..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Ændre _Kælenavn..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Ændre _Emne..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Skriv en ny adgangskode:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Forlad Gruppesamtaler"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Hvis valgt vil Gajim deltage i denne gruppe samtale ved start"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>En fejl er opstået:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Verificer igen..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Deltager"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Kast ud"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Deltager"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Udvis"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Ny Gruppe Samtale"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Fjern %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Du kan også indtaste et alternativt mødested:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Grund"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "In_viter"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Hændelse"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Hændelse"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6223,20 +6123,20 @@ msgid "Add"
 msgstr "Tilføj"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Kan fjernes"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Resource:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6246,7 +6146,7 @@ msgid "Client"
 msgstr "<b>Klient:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>System:</b>"
@@ -6391,38 +6291,39 @@ msgstr "_Vinduets adfærd:"
 msgid "_Show contact list on startup"
 msgstr "T_ilslut når Gajim startes"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Fle_t konti"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6431,12 +6332,12 @@ msgstr ""
 "Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
 "samtaler"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6445,53 +6346,53 @@ msgstr ""
 "Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i "
 "kontaktvinduet og i gruppe samtaler"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Vis kontakternes humør i kontaktvinduet"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter efter status"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Sendte kontakter:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "i _gruppe samtaler"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Bytte af punkt i kontaktvinduet"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Stavekontrol"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6503,29 +6404,29 @@ msgstr ""
 "intet sprog er valgt ved at højreklikke i indtastningsfeltet, vil standard "
 "sproget blive brugt for denne kontakt eller gruppe samtale."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "besked indhold"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Hvis en liste over følelsesikoner"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6535,58 +6436,58 @@ msgstr ""
 "kontakt ændrer hans eller hendes status og/eller hans eller hendes status "
 "besked."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Tilslutning fejlede"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Log status ændringer hos kontakter"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Vis lukke knap i faneblad?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6594,114 +6495,116 @@ msgid ""
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Vis lukke knap i faneblad?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Sidste status: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Samtaler"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Når en ny hændelse er modtaget:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Tillad pop op påmindelser når jeg er _borte/ikke tilgængelig/travel/usynlig"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Tillad pop op påmindelser når jeg er _borte/ikke tilgængelig/travel/usynlig"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Påmind mig om kontakter logger _ind"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Påmind mig om kontakter som logger u_d"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Synlige Påmindelser</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Afspil _lyde"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Hå_ndtere..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Tillad lyde når jeg er o_ptaget"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav Lyde"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Påmindelser"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Ikke Tilgængelig"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6710,7 +6613,7 @@ msgstr ""
 "Hvis valgt vil Gajim ændre status til Ikke Tilgængelig når computeren ikke "
 "har været brugt i endnu længere tid"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6719,7 +6622,7 @@ msgstr ""
 "Hvis valgt vil Gajim ændre status til Ikke Tilgængelig når computeren ikke "
 "har været brugt i endnu længere tid"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6732,7 +6635,7 @@ msgstr ""
 "$S vil blive erstattet med den forrige status besked\n"
 "$T vil blive erstattet med auto-away tidsudløb"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6745,40 +6648,40 @@ msgstr ""
 "$S vil blive erstattet med den forrige status besked\n"
 "$T vil blive erstattet med auto-not-available timeout"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutter"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatisk status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Spørg om status besked når jeg:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Logge _ind"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Log _af"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6786,68 +6689,68 @@ msgstr ""
 "Hvis aktiveret vil Gajim i spørge for en status besked. Den valgte standard "
 "besked vil blive brugt i stedet."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Standard Besked"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Status Besked"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Nuværende Status Beskeder</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Konfigurér farve og skrifttyper for brugergrænsefladen"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Status _ikonsæt:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Brug _transportens ikonsæt"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6857,120 +6760,130 @@ msgstr ""
 "kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, "
 "borte, Travlt, etc...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Stil"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Egenskaber"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Lyd / Billede"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Lyd / Billede"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Standard Besked"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Lyd / Billede"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Tilslutning"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Server:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Lyd / Billede"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "Hå_ndter..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Log status ændringer hos kontakter"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Hvis valgt vil Gajim huske adgangskoden for denne konto"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Diverse</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Åbn..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Avanceret Konfigurations Behandler"
@@ -7154,12 +7067,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Skriv en ny adgangskode:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Avancerede Handlinger"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Brug tilpasset værtsnavn/port"
@@ -7245,7 +7158,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Logge _ind"
@@ -7259,7 +7172,7 @@ msgstr "Opret et nyt tema med dit ønskede navn."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7289,8 +7202,8 @@ msgstr "_Nulstil til Standard Farver"
 msgid "Resets value to default"
 msgstr "_Nulstil til Standard Farver"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Værtsnavn:"
@@ -7333,7 +7246,7 @@ msgstr "Selvsigneret certifikat"
 msgid "Proxy Host"
 msgstr "Proxy _vært:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Type"
 
@@ -7347,8 +7260,7 @@ msgstr "_Protokol:"
 msgid "Copy info to clipboard"
 msgstr "_Kopier Henvisning"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Egenskaber"
 
@@ -7535,6 +7447,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Ændre Status Besked"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humør:</b>"
@@ -7611,8 +7528,8 @@ msgstr "Hænger"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7800,80 +7717,106 @@ msgstr "Tilslutning fejlede"
 msgid "_Name"
 msgstr "_Navn:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Start Samtale"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Forlad Gruppesamtaler"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Historik Håndterer"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Tilslutning fejlede"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Indstillinger"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Afslut"
+msgid "_Accounts"
+msgstr "Konti"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Vis"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Vis Kun _Aktive Kontakter"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Vis _Afkoblede Kontakter"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Vis Kun _Aktive Kontakter"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Vis Trans_porter"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML Konsol"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Filoverførsler"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Hjælp"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Egenskaber"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7888,6 +7831,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Forlad Gruppesamtaler"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8178,60 +8126,68 @@ msgstr "Bytte af punkt i kontaktvinduet"
 msgid "Create new group chat"
 msgstr "Forlad Gruppesamtaler"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Filoverførsler"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "status besked"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Vis _XML Konsol"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Samtale udseende</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Vis _Afkoblede Kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Vis Kun _Aktive Kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Vis Kun _Aktive Kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Kontakt Information"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Omdøb Kontakt"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Sendte kontakter:"
@@ -8308,12 +8264,16 @@ msgstr "Udfyld formen."
 msgid "Group Chat Configuration"
 msgstr "Gruppesamtale Invitation"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML Konsol"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Start Samtale..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
@@ -8359,11 +8319,6 @@ msgstr "Vis Alle Ventende Hænd_elser"
 msgid "Mute Sounds"
 msgstr "Slå lyden af"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Indstillinger"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8680,124 +8635,124 @@ msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Gruppesamtaler"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Gruppesamtaler"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Tjenesten findes ikke"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Gruppesamtaler"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Gruppesamtaler"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Gruppesamtaler"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Gruppesamtale Invitation"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Session VIL IKKE blive logget"
@@ -8826,7 +8781,7 @@ msgid "Sender: %s"
 msgstr "Afsender: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Modtager: "
 
@@ -8977,7 +8932,7 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig at sende tomme filer"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Afsender: "
 
@@ -8992,7 +8947,7 @@ msgid "Change"
 msgstr "Ændre _Kælenavn..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Snart tilbage"
@@ -9023,11 +8978,12 @@ msgid "Password Change Failed"
 msgstr "Adgangskode er Påkrævet"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Ændre Adgangskode"
 
@@ -9065,40 +9021,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Ukendt SSL fejl: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Fortsat samtale"
+msgid "Start / Join Chat"
+msgstr "Start Samtale"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan kun deltage i en gruppe samtale hvis du er tilsluttet."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Tilføj Kontakt..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s ikke fundet"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjeneste har endnu ikke svaret med detaljeret information"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9107,33 +9058,33 @@ msgstr ""
 "Denne tjeneste kunne ikke svare med detaljeret information.\n"
 "Den er højst sandsynlig ikke fungerende"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Andre"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Gruppesamtaler"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Du kan kun gennemse tilgængelige tjenester hvis du er tilsluttet"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Opdag Tjenester"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Tjenesten findes ikke"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9141,142 +9092,142 @@ msgstr ""
 "Der er ikke nogen tjenester på den adresse som du indtastede, eller serveren "
 "gav intet svar. Kontroller adressen og prøv igen."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Det er ikke mulig at gennemse denne tjeneste"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne type tjeneste har ingen elementer som kan gennemses."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Ikke gyldigt server navn"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Gennemse %(address)s med konto %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Gennemse"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjeneste har ingen elementer som kan gennemses."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Kommando"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Søg"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanner %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Brugere"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Abonnerede"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Knude"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Ny post"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Send Enkel Besked"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "emne"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Enkel Besked"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Tegn ikke tilladt: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vær venligst sikker på at du er tilsluttet med \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Det er ikke mulig at sende en besked til %s, denne JID er ikke gyldig."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
@@ -9322,94 +9273,76 @@ msgstr "Tilslutning lykkedes"
 msgid "Registration failed"
 msgstr "Tilslutning fejlede"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Ordbog for sproget %s er ikke tilgængelig"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Du må installere en %s ordbog for at bruge stavekontrol, eller vælge et "
-"andet sprog med stavekontrol sprog indstillingen.\n"
-"\n"
-"Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "for konto %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Nummer:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Gruppesamtale Invitation"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 "$Contact har inviteret dig til at deltage i en gruppe samtale %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -9424,6 +9357,11 @@ msgstr "GG Nummer:"
 msgid "ICQ Number"
 msgstr "ICQ Nummer:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Tilføj Kontakt..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9479,7 +9417,7 @@ msgstr "Fejl ved tilføjelse af tjeneste. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9641,43 +9579,63 @@ msgstr "Kontakt er ikke Tilsluttet"
 msgid "Contact Connected Background "
 msgstr "Kontakt er Tilsluttet"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Status Besked"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Status Besked"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Status Besked"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Status Besked"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Ugyldig Kælenavn"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Tegn ikke tilladt: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Vil du virkelig slette den valgte besked?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Dette navn er allerede i brug. Vil du overskrive denne status besked?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktiv"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Tilslutning fejlede"
@@ -9701,10 +9659,9 @@ msgid "Error: %s"
 msgstr "Fejl: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Fejl"
 
@@ -9718,48 +9675,48 @@ msgstr "Status er nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Alle filer"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Gør Rent"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Håndter Proxy Profiler"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Tilpas til status"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Afkoblet"
@@ -9780,7 +9737,7 @@ msgstr "Konto"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Din nye konto er blevet oprettet med succes"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9812,60 +9769,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Synkroniser"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Hvad vil du gøre?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Tilslutter"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Videresend ulæste beskeder"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "En GTK+ Jabber klient"
@@ -9922,125 +9884,125 @@ msgstr "Taknemlig"
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr "Vælg en fil at sende..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Vælg Billede"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Alle filer"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Alle filer"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Send _Fil"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Billeder"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vælg Billede"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Alle filer"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr "Gem fil som..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s af denne gruppe samtale"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Tilslutning afbrudt"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Filnavn: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Hent"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Send"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Filoverførsel stoppede"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Midlertidig stoppet"
@@ -10049,7 +10011,7 @@ msgstr "?transfer status:Midlertidig stoppet"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Ugyldig Fil"
@@ -10105,26 +10067,26 @@ msgstr "Gruppe Samtale Besked Fremhævning"
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Ingen"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Afbryd"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10143,11 +10105,6 @@ msgstr "med konto %s"
 msgid "Hide _Contact List"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Vis Kun _Aktive Kontakter"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
@@ -10197,36 +10154,31 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Indstillinger"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Indstillinger"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Du er ikke tilsluttet til serveren"
+msgid "Archiving Preferences Error"
+msgstr "_Indstillinger"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Fejl i modtaget dataform"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Indstillinger"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktiveret"
@@ -10275,81 +10227,81 @@ msgstr "?Ask (for Subscription):Intet"
 msgid "?password:Hidden"
 msgstr "Adgangskode:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Indstillinger"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Lyd / Billede"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Understøtter start af lyd og billede chat."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Egenskab ikke tilgængelig under Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr "Evnen til at måle tomgangs tid, for at kunne sætte automatisk status."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Biblioteket libxss kræves"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10357,103 +10309,101 @@ msgid ""
 msgstr ""
 "Serverløs samtale med automatisk opdagede klienter i et lokalt netværk."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Kræver python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Kræver pybonjour og bonjour SDK kører (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Tilslutning"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Kræver Gspell"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Egenskab ikke tilgængelig under Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Påmindelser"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Understøtter start af lyd og billede chat."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Kræver python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Gem adgangskode"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Adgangskoder kan blive gemt sikkert og ikke bare i ren tekst."
 
-#: gajim/gtk/features.py:140
+#: gajim/gtk/features.py:129
 #, fuzzy
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
-"Kræver libsecret og en udbyder (f.eks. GNOME Keyring og KSecretService)"
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Kræver gnome-keyring og python-gnome2-desktop, eller kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Stavekontrol"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Kræver Gspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Kræver python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Indstillinger"
@@ -10500,7 +10450,7 @@ msgstr "Ugyldig Listenavn"
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må indtaste et navn for at skabe en privatlivs liste."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Inviter _Kontakter"
@@ -10528,7 +10478,7 @@ msgstr "_Færdig"
 msgid "Commands"
 msgstr "Kommando"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10601,118 +10551,132 @@ msgstr "Forespørgsel om abonnering fra %s"
 msgid "Loading"
 msgstr "Koder"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Tilsluttet"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Fjerne kontoen med navnet %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Tryk for at ændre kontoens adgangskode"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Tilslutter"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Din server understøtter ikke Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Tegn ikke tilladt: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Din server understøtter ikke Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Tilslutning Fejlede"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Tilføj Kontakt..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Lav en ny post"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Personlig port må være et port nummer."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Avancerede Handlinger"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Advarsel"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Ukendt SSL fejl: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registrer til %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Konto"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Kontoen er blevet tilføjet med succes"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Konti"
@@ -10755,250 +10719,254 @@ msgstr "Søg"
 msgid "No results found"
 msgstr "Intet resultat"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Standard"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "status besked Titel"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "status besked tekst"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Log ind igen nu?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Log ind igen nu?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Hvis du vil at alle ændringerne skal træde i kraft nu, må du logge ind igen."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Ugyldig Konto"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Alle samtale og gruppesamtale vinduer vil blive lukket. Vil du fortsætte?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Ugyldig Konto"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Selvsigneret certifikat"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "T_ilslut når Gajim startes"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Gem konversations _logger for alle kontakter"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Status For Alle"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Ændrer status for kontoen eller konti"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Brug fil transport proxy"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " siden %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorer hændelser fra kontakter som ikke er i kontaktvinduet"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tet:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "br_ug HTTP__PROXY miljøvariablen"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Ændrer status for kontoen eller konti"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Fornavn:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Efternavn:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Ny E-post"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Tilpas til status"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Aktiver"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Tilslutning"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Selvsigneret certifikat"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Gem adgangskode"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Tilslutning fejlede"
@@ -11051,19 +11019,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Fjerner kontakt fra kontaktvinduet"
 msgstr[1] "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Ukendt Artist"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Ukendt Titel"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Ukendt Kilde"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11077,22 +11045,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Bogmærke"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Filen er tom"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Tjeneste sendte malformeret data"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11149,127 +11117,246 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Vis Alle Ventende Hænd_elser"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Egenskaber"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Stavekontrol af forfattede beskeder."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontakter"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Gruppesamtaler"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "For nylig:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Tilslutning fejlede"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Fortsat samtale"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Ukendt SSL fejl: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "Kræver libsecret og en udbyder (f.eks. GNOME Keyring og KSecretService)"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Vælg interval mellem 2 kontroller for ingen aktivitet."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Ordbog for sproget %s er ikke tilgængelig"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Du må installere en %s ordbog for at bruge stavekontrol, eller vælge et "
+#~ "andet sprog med stavekontrol sprog indstillingen.\n"
+#~ "\n"
+#~ "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Tilslut igen"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Afslut"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Vis Kun _Aktive Kontakter"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Tilføj Kontakt..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Inviter _Kontakter"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Forlad Gruppesamtaler"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Ny Gruppe Samtale"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Hvis Sandt, vil Gajim vise et ikon på hvert faneblad som indeholder "
+#~ "ulæste beskeder. Afhængig af temaet, kan dette ikon være animeret."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Ugyldig karakter i værtsnavn."
+
+#~ msgid "Server address required."
+#~ msgstr "Server adresse påkrævet."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Ugyldig karakter i brugernavn."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Ugyldig karakter i ressource."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Påmind mig om kontakter logger _ind"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Påmind mig om kontakter som logger u_d"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Påmind mig når en filoverførsel er færdig"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Påmind mig når en filoverførsel er færdig"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Baggrundsfarve på kontakter når de netop har tilsluttet sig."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Hændelse"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Hændelse"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Du er ikke tilsluttet til serveren"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Ressource Konflikt"
 
@@ -11902,9 +11989,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Send en Privat Besked"
 
-#~ msgid "Send _File"
-#~ msgstr "Send _Fil"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Deltagere"
@@ -14116,10 +14200,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Hænger"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Tilslutning fejlede"
-
 #~ msgid "cyan"
 #~ msgstr "cyan"
 
@@ -14631,9 +14711,6 @@ msgstr "Tilslutning fejlede"
 #~ "din opsætning kan du vælge en anden her.\n"
 #~ "Du bør også ændre opsætning tilsvarende på en evt. brandmur."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Fle_t konti"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "Det er ikke muligt at bruge OpenPGP på denne computer"
 
@@ -15117,9 +15194,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Kræver python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Kræver gnome-keyring og python-gnome2-desktop, eller kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/de.po b/po/de.po
index 89def2163..52f9f54fe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2016-11-27 12:58+0100\n"
 "Last-Translator: Dominik George <nik@naturalnet.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -23,72 +23,78 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, python-format
+msgid "Account: %s"
+msgstr "Konto: %s"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "und NICHT authentifiziert"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s Verschlüsselung aktiv %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "Rü_ckgängig"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Zurücksetzen"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "Als Zitat einfügen"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "Bild einfügen"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
-msgstr "Sie sind dabei ein Bild einzufügen"
+msgstr "Du bist dabei ein Bild einzufügen"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
-"Wollen Sie das Bild aus der Zwischenablage wirklich in den Chat einfügen?"
+"Willst du das Bild aus der Zwischenablage wirklich in den Chat einfügen?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Warnung"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
-"Wenn Sie eine Datei an <b>%s</b> senden, werden Sie dem Kontakt Ihre echte "
+"Wenn du eine Datei an <b>%s</b> sendest, wirst du dem Kontakt deine echte "
 "XMPP-Adresse offenbaren."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -117,7 +123,7 @@ msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr ""
-"Dieser Kontakt ist an Ihrem Online-Status interessiert, aber Sie nicht an "
+"Dieser Kontakt ist an deinem Online-Status interessiert, aber du nicht an "
 "seinem"
 
 #: gajim/vcard.py:365
@@ -125,21 +131,21 @@ msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
-"Sie sind am Online-Status des Kontakts interessiert, aber er nicht an Ihrem"
+"Du bist am Online-Status des Kontakts interessiert, aber er nicht an deinem"
 
 #: gajim/vcard.py:367
 msgid "The contact and you want to exchange presence information"
-msgstr "Sie und der Kontakt wollen beide den Online-Status austauschen"
+msgstr "Du und der Kontakt wollen beide den Online-Status austauschen"
 
 #: gajim/vcard.py:369
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
-msgstr "Sie und Ihr Kontakt tauschen beide nicht den Online-Status aus"
+msgstr "Du und dein Kontakt tauschen beide nicht den Online-Status aus"
 
 #: gajim/vcard.py:375
 msgid "You are waiting contact's answer about your subscription request"
-msgstr "Sie warten auf die Antwort des Kontaktes zu Ihrer Kontaktanfrage"
+msgstr "Du wartest auf die Antwort des Kontaktes zu deiner Kontaktanfrage"
 
 #: gajim/vcard.py:377
 msgid "There is no pending subscription request."
@@ -149,428 +155,423 @@ msgstr "Es gibt keine offenen Kontaktanfragen."
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 msgid "Not in contact list"
 msgstr "Nicht in Kontaktliste"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 msgid "I would like to add you to my contact list"
-msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen"
+msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen"
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Einzelne Nachricht _senden…"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "Befehl ausführen…"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Transport verwalten"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Transport ändern"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "_Umbenennen…"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Sperrung aufheben"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Sperren"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Ent_fernen"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informationen"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Datei senden…"
+#: gajim/gui_menu_builder.py:517
+msgid "Send File"
+msgstr "Datei senden"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
 msgstr "Datei hochladen…"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr "Datei direkt senden…"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 msgid "Send Chatstate"
 msgstr "Chatstatus senden"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
-msgstr "Kontakte einladen"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+msgid "Invite Contacts…"
+msgstr "Kontakte einladen…"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
-msgid "Add to Contact List"
-msgstr "Kontakt hinzufügen"
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
+msgid "Add to Contact List…"
+msgstr "Kontakt hinzufügen…"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 msgid "Voice Chat"
 msgstr "Sprachanruf"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 msgid "Video Chat"
 msgstr "Videoanruf"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "Informationen"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "Unterhaltungsverlauf"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+msgid "Composing Only"
 msgstr "Nur Schreibbenachrichtigung"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
+#: gajim/gui_menu_builder.py:535
+msgid "All Chat States"
 msgstr "Jeden Chatstatus"
 
-#: gajim/gui_menu_builder.py:575
-msgid "Invite Contact"
-msgstr "Kontakt einladen"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 msgid "Manage Group Chat"
 msgstr "Gruppenchat verwalten"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
-msgid "Rename Group Chat"
-msgstr "Gruppenchat umbenennen"
-
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
-msgstr "Thema ändern"
+#: gajim/gui_menu_builder.py:575
+msgid "Rename…"
+msgstr "Umbenennen…"
 
-#: gajim/gui_menu_builder.py:579
-msgid "Configure Group Chat"
-msgstr "Gruppenchat konfigurieren"
+#: gajim/gui_menu_builder.py:576
+msgid "Change Subject…"
+msgstr "Thema ändern…"
 
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "Kontaktbild hochladen…"
 
-#: gajim/gui_menu_builder.py:581
-msgid "Destroy Group Chat"
-msgstr "Gruppenchat auflösen"
+#: gajim/gui_menu_builder.py:578
+msgid "Configure…"
+msgstr "Konfigurieren…"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+msgid "Destroy…"
+msgstr "Auflösen…"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 msgid "Chat Settings"
 msgstr "Chat-Einstellungen"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr "Beitreten/Verlassen anzeigen"
 
-#: gajim/gui_menu_builder.py:585
-msgid "Show status changes"
+#: gajim/gui_menu_builder.py:583
+msgid "Show Status Changes"
 msgstr "Statusänderungen anzeigen"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
+#: gajim/gui_menu_builder.py:584
+msgid "Notify on all Messages"
 msgstr "Benachrichtigung bei allen Meldungen"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr "Beim Schließen minimieren"
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr "Bei automatischem Beitritt minimieren"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "Synchronisationsbegrenzung"
 
-#: gajim/gui_menu_builder.py:593
-msgid "Change Nickname"
-msgstr "Spitznamen ändern"
+#: gajim/gui_menu_builder.py:591
+msgid "Change Nickname…"
+msgstr "Spitznamen ändern…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "Anfrage für Schreibrechte"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "Befehl ausführen"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+msgid "Execute Command…"
+msgstr "Befehl ausführen…"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr "Verlassen"
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "Keine Begrenzung"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i Tag"
 msgstr[1] "%i Tage"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Nur Schreibbenachrichtigung"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Jeden Chatstatus"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
 msgstr "Kontakt hinzufügen…"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "Einzelne Nachricht senden…"
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
-msgstr "Dienste durchsuchen"
+#: gajim/gui_menu_builder.py:674
+msgid "Discover Services…"
+msgstr "Dienste durchsuchen…"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "Server-Informationen"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "Archiveinstellungen bearbeiten"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 msgid "Blocking List"
 msgstr "Sperrliste"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Gruppenchats verwalten"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 msgid "PEP Configuration"
 msgstr "PEP-Konfiguration"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
-msgstr "Unterhaltungsverlauf synchronisieren"
+#: gajim/gui_menu_builder.py:681
+msgid "Synchronise History…"
+msgstr "Unterhaltungsverlauf synchronisieren…"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 msgid "Send Server Message…"
 msgstr "Servernachricht senden…"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 msgid "Set MOTD…"
 msgstr "Nachricht des Tages (MOTD) festlegen…"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr "Nachricht des Tages (MOTD) aktualisieren…"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 msgid "Delete MOTD…"
 msgstr "Nachricht des Tages (MOTD) löschen…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 msgid "_Add Account…"
 msgstr "Konto _hinzufügen…"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 msgid "_Modify Accounts…"
 msgstr "Konten _bearbeiten…"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 msgid "_Modify Account…"
 msgstr "Konto _bearbeiten…"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Konten"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 msgid "Copy XMPP Address"
 msgstr "XMPP-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
 msgstr "Gruppenchat beitreten"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-msgid "Add to Contact List…"
-msgstr "Kontakt hinzufügen…"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
 msgstr "Link-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 msgid "Open Link in Browser"
 msgstr "Link im Webbrowser öffnen"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
 msgstr "E-Mail-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 msgid "Open Email Composer"
 msgstr "Im E-Mail-Programm öffnen"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 msgid "Copy Location"
 msgstr "Link-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 msgid "Show Location"
 msgstr "Standort anzeigen"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 msgid "Copy XMPP Address/Email"
 msgstr "XMPP-/E-Mail-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 msgid "Invite"
 msgstr "Einladen"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr "Sperrung aufheben"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr "Sperren"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 msgid "Kick"
 msgstr "Rauswerfen"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 msgid "Ban"
 msgstr "Sperren"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 msgid "Make Owner"
-msgstr "Zum Besitzer machen"
+msgstr "Zum Eigentümer machen"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 msgid "Make Admin"
 msgstr "Zum Admin machen"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 msgid "Make Member"
 msgstr "Zum Mitglied machen"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 msgid "Revoke Member"
 msgstr "Mitgliedschaft entziehen"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr "Schreibrechte erteilen"
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 msgid "Revoke Voice"
 msgstr "Schreibrechte entziehen"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 msgid "Copy"
 msgstr "Kopieren"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Optionen:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Diese Nachricht anzeigen und beenden"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Verzeichnis für Log-Datei auswählen"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Kann die Datenbank mit den Unterhaltungsverläufen nicht finden"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "%s existiert nicht."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 msgid "XMPP Address"
 msgstr "XMPP-Adresse"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -578,27 +579,27 @@ msgstr "Datum"
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Nachricht"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Thema"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Datenbank aufräumen"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 msgid "Clean up the database?"
 msgstr "Die Datenbank aufräumen?"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
@@ -608,268 +609,272 @@ msgstr ""
 "Normalerweise wird der reservierte Datenbankspeicherplatz nicht freigegeben, "
 "er wird nur wiederverwendbar. Dieser Vorgang kann eine Weile dauern."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 msgid "_Cleanup"
 msgstr "_Aufräumen"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
-msgstr "Sie"
+msgstr "Du"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s sagte um %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Löschen"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Unterhaltung löschen"
 msgstr[1] "Unterhaltungen löschen"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
-msgstr[0] "Wollen Sie die Unterhaltung mit <b>%s</b> dauerhaft löschen?"
-msgstr[1] "Wollen Sie die Unterhaltungen dauerhaft löschen?"
+msgstr[0] "Willst du die Unterhaltung mit <b>%s</b> dauerhaft löschen?"
+msgstr[1] "Willst du die Unterhaltungen dauerhaft löschen?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Nachricht löschen"
 msgstr[1] "Nachrichten löschen"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Wollen Sie die ausgewählte Nachricht dauerhaft löschen?"
-msgstr[1] "Wollen Sie die ausgewählten Nachrichten dauerhaft löschen?"
+msgstr[0] "Willst du die ausgewählte Nachricht dauerhaft löschen?"
+msgstr[1] "Willst du die ausgewählten Nachrichten dauerhaft löschen?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr "XMPP-Adresse: <i>%s</i>"
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Allgemein"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Gruppe"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Stimmung festlegen"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Keine(r)"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusnachricht"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Statusnachricht"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
-"Dieser Name wird bereits verwendet. Möchten Sie die Statusnachricht "
+"Dieser Name wird bereits verwendet. Möchtest du die Statusnachricht "
 "überschreiben?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr "Über_schreiben"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 msgid "Status Preset"
 msgstr "Gespeicherte Statusnachricht"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 msgid "Save status as preset"
 msgstr "Status als Voreinstellung speichern..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 msgid "Please assign a name to this status message preset"
-msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein"
+msgstr "Bitte gib einen Namen für diese Statusnachricht ein"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 msgid "_Save"
 msgstr "_Speichern"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 msgid "New Status"
 msgstr "Neuer Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
-msgstr "Sie sind nicht mit dem Server verbunden"
+msgstr "Du bist nicht mit dem Server verbunden"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
+msgstr "Du musst verbunden sein, um deine Kontakte synchronisieren zu können."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Name"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Dieses Konto ist nicht mit dem Server verbunden"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
-"Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
+"Du kannst ein Konto nicht synchronisieren, solange es nicht verbunden ist."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "eine Audio und Video"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "eine Audio"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "eine Video"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
-"%(contact)s möchte einen %(type)s-Anruf mit Ihnen starten. Möchten Sie den "
+"%(contact)s möchte einen %(type)s-Anruf mit dir starten. Möchtest du den "
 "Anruf annehmen?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Datei senden…"
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Datei senden (max. %s MiB)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 msgid "No File Transfer available"
 msgstr "Keine Dateiübertragung vorhanden"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 msgid "Invalid XMPP Address"
 msgstr "Ungültige XMPP-Adresse"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Bild konnte nicht geladen werden"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, python-format
 msgid "Kick %s"
 msgstr "%s rauswerfen"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr "%s sperren"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Spitznamen einfügen"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 msgid "Voice Request"
 msgstr "Anfrage für Schreibrechte"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
-msgstr "<b>%s</b> aus <b>%s</b> fragt Schreibrechte an"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
+msgstr "<b>%(nick)s</b> aus <b>%(room_name)s</b> fragt Schreibrechte an"
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr "_Bestätigen"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s hat das Thema geändert: %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr "Der Gruppenchat zeigt nun abwesende Teilnehmer an"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 msgid "Group chat now does not show unavailable members"
 msgstr "Der Gruppenchat zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 "Es wurde eine Einstellung verändert, die nicht die Privatsphäre betrifft"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 msgid "Conversations are stored on the server"
 msgstr "Unterhaltungsverlauf wird auf dem Server gespeichert"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 msgid "Conversations are not stored on the server"
 msgstr "Unterhaltungsverlauf wird nicht auf dem Server gespeichert"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 msgid "Group chat is now non-anonymous"
 msgstr "Der Gruppenchat ist jetzt nicht anonym"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 msgid "Group chat is now semi-anonymous"
 msgstr "Der Gruppenchat ist jetzt halbanonym"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 msgid "Group chat is now fully anonymous"
 msgstr "Der Gruppenchat ist jetzt vollständig anonym"
 
@@ -883,18 +888,18 @@ msgstr "Ping? (%s)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Fehler."
 
 #: gajim/groupchat_control.py:1238
 #, python-format
 msgid "You (%s) joined the group chat"
-msgstr "Sie (%s) sind dem Gruppenchat beigetreten"
+msgstr "Du (%s) bist dem Gruppenchat beigetreten"
 
 #: gajim/groupchat_control.py:1243
 msgid "Any participant is allowed to see your full XMPP Address"
-msgstr "Jeder Teilnehmer darf Ihre vollständige XMPP-Adresse sehen"
+msgstr "Jeder Teilnehmer darf deine vollständige XMPP-Adresse sehen"
 
 #: gajim/groupchat_control.py:1251
 msgid "The server has assigned or modified your nickname in this group chat"
@@ -910,22 +915,22 @@ msgstr "Ein neuer Gruppenchat wurde erstellt"
 msgid "Failed to Configure Group Chat"
 msgstr "Konfiguration des Gruppenchats fehlgeschlagen"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
-msgstr "Sie heißen nun %s"
+msgstr "Du heißt nun %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} heißt jetzt {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
-msgstr "Sie sind nun {show}{status}"
+msgstr "Du bist nun {show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} ist jetzt {show}{status}"
@@ -940,7 +945,7 @@ msgstr " durch {actor}"
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
-"** Ihre Gruppenzugehörigkeit wurde festgelegt auf {affiliation}{actor}"
+"** Deine Gruppenzugehörigkeit wurde festgelegt auf {affiliation}{actor}"
 "{reason}"
 
 #: gajim/groupchat_control.py:1334
@@ -953,7 +958,7 @@ msgstr ""
 #: gajim/groupchat_control.py:1358
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
-msgstr "** Ihre Rolle wurde festgelegt auf {role}{actor}{reason}"
+msgstr "** Deine Rolle wurde festgelegt auf {role}{actor}{reason}"
 
 #: gajim/groupchat_control.py:1363
 #, python-brace-format
@@ -963,22 +968,22 @@ msgstr "** Die Rolle von {nick} wurde festgelegt auf {role}{actor}{reason}"
 #: gajim/groupchat_control.py:1386
 #, python-brace-format
 msgid "You have been removed from the group chat{actor}{reason}"
-msgstr "Sie wurden aus dem Gruppenchat entfernt{actor}{reason}"
+msgstr "Du wurdest aus dem Gruppenchat entfernt{actor}{reason}"
 
 #: gajim/groupchat_control.py:1391
 #, python-brace-format
 msgid "You have left due to an error{reason}"
-msgstr "Sie haben den Gruppenchat bedingt durch einen Fehler verlassen{reason}"
+msgstr "Du hast den Gruppenchat fehlerbedingt verlassen{reason}"
 
 #: gajim/groupchat_control.py:1397
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
-msgstr "Sie wurden aus dem Gruppenchat geworfen{actor}{reason}"
+msgstr "Du wurdest aus dem Gruppenchat geworfen{actor}{reason}"
 
 #: gajim/groupchat_control.py:1404
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
-msgstr "Sie wurden gesperrt{actor}{reason}"
+msgstr "Du wurdest gesperrt{actor}{reason}"
 
 #: gajim/groupchat_control.py:1411 gajim/groupchat_control.py:1476
 msgid ": Affiliation changed"
@@ -1034,7 +1039,7 @@ msgstr "Gruppenchat wurde aufgelöst"
 #: gajim/groupchat_control.py:1547
 #, python-format
 msgid "You can join this group chat instead: xmpp:%s?join"
-msgstr "Sie können stattdessen diesem Gruppenchat beitreten: xmpp:%s?join"
+msgstr "Du kannst stattdessen diesem Gruppenchat beitreten: xmpp:%s?join"
 
 #: gajim/groupchat_control.py:1732
 msgid "Leave Group Chat"
@@ -1042,87 +1047,87 @@ msgstr "Gruppenchat verlassen"
 
 #: gajim/groupchat_control.py:1733
 msgid "Are you sure you want to leave this group chat?"
-msgstr "Möchten Sie den Gruppenchat wirklich verlassen?"
+msgstr "Möchtest du den Gruppenchat wirklich verlassen?"
 
 #: gajim/groupchat_control.py:1734
 #, python-format
 msgid "If you close this window, you will leave '%s'."
-msgstr "Wenn Sie dieses Fenster schließen, werden Sie \"%s\" verlassen."
+msgstr "Wenn du dieses Fenster schließt, wirst du \"%s\" verlassen."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr "_Verlassen"
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s wurde in diesen Gruppenchat eingeladen"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Schriftformatierungen anzeigen"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Der Kontakt unterstützt keine HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s Sekunden)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s Status: %(state)s, Begründung: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus dem Gruppenchat %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 "Hinweis: Für diesen Kontakt wird kein Unterhaltungsverlauf gespeichert."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr "Hinweis: Für dieses Konto wird kein Unterhaltungsverlauf gespeichert."
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr ""
-"Sie haben gerade eben eine neue Nachricht von %s erhalten.\n"
-"Wollen Sie diesen Tab schließen?"
+"Du hast soeben eine neue Nachricht von %s erhalten.\n"
+"Willst du diesen Tab schließen?"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 msgid "Close"
 msgstr "Schließen"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr "_Schließen"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1131,199 +1136,191 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s ist jetzt %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "Dateiübertragung"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Größe"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 msgid "_Accept"
 msgstr "_Annehmen"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "A_blehnen"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 msgid "Open _Folder"
 msgstr "_Ordner öffnen"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 msgid "Group Chat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
-msgstr "Ihr Kontakt hat die Dateiübertragung gestoppt"
+msgstr "Dein Kontakt hat die Dateiübertragung gestoppt"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung abgebrochen"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Verbindung zum Kontakt kann nicht hergestellt werden."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr "Version des Programms anzeigen"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "Nur kritische Fehler anzeigen"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 "Profildateien vollständig trennen (auch die Datenbank für "
 "Unterhaltungsverläufe sowie Plugins)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr "XML-Stanzas und andere Debuginformationen anzeigen"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Verwende im Konfigurationsverzeichnis festgelegtes Profil"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Konfigurationsverzeichnis festlegen"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Logging-System konfigurieren"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "Zeige alle Warnungen"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "Öffne iPython-Shell"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Öffnet ein Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Neuen Chat starten"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "Simuliere Verbindungsverlust im Netzwerk"
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "Simuliere die Wiederherstellung der Netzwerkverbindung"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Zusammengeführte Konten"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transporte"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 msgid "Group chats"
 msgstr "Gruppenchats"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
-msgstr "\"%s\" sieht jetzt Ihren Status."
+msgstr "\"%s\" sieht jetzt deinen Status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Kontaktanfrage wurde gesendet"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, python-format
 msgid "If \"%s\" accepts this request you will know their status."
-msgstr "Wenn \"%s\" diese Anfrage akzeptiert, können Sie den Status sehen."
+msgstr "Wenn \"%s\" diese Anfrage akzeptiert, kannst du den Status sehen."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
-msgstr "\"%s\" wird Sie nun immer als offline sehen."
+msgstr "\"%s\" wird dich nun immer als offline sehen."
 
 #: gajim/roster_window.py:2268
 msgid "desynced"
 msgstr "Nicht synchronisiert"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr "Gajim beenden"
 
 #: gajim/roster_window.py:2337
 msgid "You are about to quit Gajim"
-msgstr "Sie sind dabei Gajim zu beenden"
+msgstr "Du bist dabei Gajim zu beenden"
 
 #: gajim/roster_window.py:2338
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Möchten Sie Gajim wirklich beenden?"
+msgstr "Möchtest du Gajim wirklich beenden?"
 
 #: gajim/roster_window.py:2339
 msgid "_Always quit when closing Gajim"
 msgstr "_Immer beenden wenn Gajim geschlossen wird"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Beenden"
 
@@ -1333,16 +1330,16 @@ msgstr "Dateiübertragungen stoppen"
 
 #: gajim/roster_window.py:2432
 msgid "You still have running file transfers"
-msgstr "Sie haben noch laufende Dateiübertragungen"
+msgstr "Du hast noch laufende Dateiübertragungen"
 
 #: gajim/roster_window.py:2433
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
-"Wenn Sie jetzt beenden, werden die laufenden Dateiübertragungen "
+"Wenn du Gajim jetzt beendest, werden die laufenden Dateiübertragungen "
 "abgebrochen.\n"
-"Möchten Sie dennoch beenden?"
+"Gajim wirklich beenden?"
 
 #: gajim/roster_window.py:2471
 msgid "Unread Messages"
@@ -1350,7 +1347,7 @@ msgstr "Ungelesene Nachrichten"
 
 #: gajim/roster_window.py:2472
 msgid "You still have unread messages"
-msgstr "Sie haben noch ungelesene Nachrichten"
+msgstr "Du hast noch ungelesene Nachrichten"
 
 #: gajim/roster_window.py:2473
 msgid ""
@@ -1363,11 +1360,11 @@ msgstr ""
 
 #: gajim/roster_window.py:2733
 msgid "You have unread messages"
-msgstr "Sie haben ungelesene Nachrichten"
+msgstr "Du hast ungelesene Nachrichten"
 
 #: gajim/roster_window.py:2734
 msgid "You must read them before removing this transport."
-msgstr "Sie müssen sie lesen, bevor der Transport entfernt wird."
+msgstr "Du musst sie lesen, bevor der Transport entfernt wird."
 
 #: gajim/roster_window.py:2737
 #, python-format
@@ -1379,8 +1376,8 @@ msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using this transport."
 msgstr ""
-"Sie werden keine Nachrichten mehr mit Kontakten austauschen können, die "
-"diesen Transport nutzen."
+"Du wirst keine Nachrichten mehr mit Kontakten austauschen können, die diesen "
+"Transport nutzen."
 
 #: gajim/roster_window.py:2741
 msgid "Transports will be removed"
@@ -1393,8 +1390,8 @@ msgid ""
 "using these transports:\n"
 "%s"
 msgstr ""
-"Sie werden keine Nachrichten mehr mit Kontakten austauschen können, die "
-"diesen Transport nutzen:\n"
+"Du wirst keine Nachrichten mehr mit Kontakten austauschen können, die diesen "
+"Transport nutzen:\n"
 "%s"
 
 #: gajim/roster_window.py:2750
@@ -1414,7 +1411,7 @@ msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
-"Der Kontakt wird Sie als offline sehen und Sie werden von dem Kontakt keine "
+"Der Kontakt wird dich als offline sehen und du wirst von dem Kontakt keine "
 "Nachrichten mehr empfangen."
 
 #: gajim/roster_window.py:2824
@@ -1434,7 +1431,7 @@ msgid ""
 "All contacts of this group will see you as offline and you will not receive "
 "any messages sent to you by any one of these contacts."
 msgstr ""
-"Alle Kontakte dieser Gruppe werden Sie als offline sehen und Sie werden von "
+"Alle Kontakte dieser Gruppe werden dich als offline sehen und du wirst von "
 "den Kontakten der Gruppe keine Nachrichten mehr empfangen."
 
 #: gajim/roster_window.py:2831
@@ -1452,7 +1449,7 @@ msgstr "Kontakt %s umbenennen?"
 
 #: gajim/roster_window.py:2887
 msgid "Please enter a new nickname"
-msgstr "Bitte geben Sie einen neuen Spitznamen ein"
+msgstr "Bitte gib einen neuen Spitznamen ein"
 
 #: gajim/roster_window.py:2894
 msgid "Rename Group"
@@ -1465,10 +1462,10 @@ msgstr "Gruppe %s umbenennen?"
 
 #: gajim/roster_window.py:2896
 msgid "Please enter a new name"
-msgstr "Bitte geben Sie einen neuen Namen ein"
+msgstr "Bitte gib einen neuen Namen ein"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 msgid "_Rename"
 msgstr "_Umbenennen"
 
@@ -1479,51 +1476,56 @@ msgstr "Gruppe entfernen"
 #: gajim/roster_window.py:2950
 #, python-format
 msgid "Do you want to remove %s from the contact list?"
-msgstr "Möchten Sie %s von Ihrer Kontaktliste entfernen?"
+msgstr "Möchtest du %s von deiner Kontaktliste entfernen?"
 
 #: gajim/roster_window.py:2951
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "_Zusätzlich alle Kontakte dieser Gruppe aus der Kontaktliste entfernen"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+msgid "Rename Group Chat"
+msgstr "Gruppenchat umbenennen"
+
+#: gajim/roster_window.py:3045
 msgid "Please enter a new name for this group chat"
-msgstr "Bitte geben Sie einen neuen Namen für diesen Gruppenchat ein"
+msgstr "Bitte gib einen neuen Namen für diesen Gruppenchat ein"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 msgid "Remove contact from contact list"
 msgstr "Kontakt aus der Kontaktliste entfernen"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
-msgstr "Sie sind dabei %(name)s (%(jid)s) aus der Kontaktliste zu entfernen.\n"
+msgstr "Du bist dabei %(name)s (%(jid)s) aus der Kontaktliste zu entfernen.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr ""
-"Durch das Entfernen des Kontakts entziehen Sie diesem auch die Berechtigung, "
-"Ihren Status zu sehen. Der Kontakt wird Sie also nur noch als offline sehen."
+"Durch das Entfernen des Kontakts entziehst du diesem auch die Berechtigung, "
+"deinen Status zu sehen. Der Kontakt wird dich also nur noch als offline "
+"sehen."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
-msgstr "Möchten Sie fortfahren?"
+msgstr "Möchtest du fortfahren?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr ""
 "_Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 msgid "Remove contacts from contact list"
 msgstr "Kontakte aus der Kontaktliste entfernen"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1531,45 +1533,44 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Durch das Entfernen der folgenden Kontakte entziehen Sie diesen auch die "
-"Berechtigung, Ihren Status zu sehen. Die Kontakte werden Sie also nur noch "
+"Durch das Entfernen der folgenden Kontakte entziehst du diesen auch die "
+"Berechtigung, deinen Status zu sehen. Die Kontakte werden dich also nur noch "
 "als offline sehen:\n"
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 msgid "Remove Contacts"
 msgstr "Kontakte entfernen"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Kein Konto eingerichtet"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
-"Sie müssen ein Konto erstellen, bevor Sie Nachrichten mit anderen Kontakten "
-"austauschen können."
+"Du musst ein Konto erstellen, bevor du Nachrichten mit anderen Kontakten "
+"austauschen kannst."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
-"Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
+"Das Speichern von Metakontakten wird von deinem Server nicht unterstützt"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
-"Ihr Server unterstützt das Speichern von Metakontakt-Informationen nicht. "
-"Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
-"gespeichert."
+"Dein Server unterstützt das Speichern von Metakontakt-Informationen nicht. "
+"Daher werden diese Informationen bei der nächsten Verbindung verloren gehen."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
-msgstr "Sie sind dabei, einen Metakontakt zu erstellen"
+msgstr "Du bist dabei einen Metakontakt zu erstellen"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
@@ -1579,120 +1580,120 @@ msgstr ""
 "Kontakt zu gruppieren. Metakontakte werden normalerweise dann verwendet, "
 "wenn dieselbe Person mehrere XMPP- oder Transport-Konten hat."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 msgid "Create Metacontact"
 msgstr "Metakontakt erstellen"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr "_Erstellen"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Diese Datei an %s senden:\n"
 msgstr[1] "Diese Dateien an %s senden:\n"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Senden"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Sende %(from)s an %(to)s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s zum ersten Kontakt machen"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%(contact1)s und %(contact2)s zu einem Metakontakt zusammenführen"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Statusnachricht ändern"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Standort veröffentlichen"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "Kontakte ver_walten"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "_Gruppen bearbeiten…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 msgid "Re_name"
 msgstr "_Umbenennen"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "Wieder ve_rbinden"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "Befehl ausführen"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "Unter_haltungsverlauf"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Unterhaltungsverläufe verwalten"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Beobachter"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
-"Beobachter können Ihren Status sehen, Sie jedoch nicht den der Beobachter"
+"Beobachter können deinen Status sehen, du jedoch den der Beobachter nicht"
 
 #: gajim/conversation_textview.py:63
 msgid "Untrusted"
@@ -1715,7 +1716,7 @@ msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
-"Der Text unterhalb dieser Linie zeigt, was seit Ihrem\n"
+"Der Text unterhalb dieser Linie zeigt, was seit deinem\n"
 "letzten Besuch in diesem Gruppenchat gesagt wurde"
 
 #: gajim/conversation_textview.py:518
@@ -1789,11 +1790,11 @@ msgstr "Tabs schließen"
 
 #: gajim/message_window.py:362
 msgid "You are about to close several tabs"
-msgstr "Sie sind dabei mehrere Tabs zu schließen"
+msgstr "Du bist dabei mehrere Tabs zu schließen"
 
 #: gajim/message_window.py:363
 msgid "Do you really want to close all of them?"
-msgstr "Möchten Sie wirklich alle schließen?"
+msgstr "Möchtest du wirklich alle schließen?"
 
 #: gajim/message_window.py:522
 msgid "?Noun:Chats"
@@ -1811,234 +1812,234 @@ msgstr "Private Chats"
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisierung für %(url)s (ID: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
-msgstr "Akzeptieren Sie diese Anfrage?"
+msgstr "Akzeptierst du diese Anfrage?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, python-format
 msgid "Do you accept this request (account: %s)?"
-msgstr "Akzeptieren Sie diese Anfrage (Konto: %s)?"
+msgstr "Akzeptierst du diese Anfrage (Konto: %s)?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 msgid "Authorization Request"
 msgstr "Autorisierungsanfrage"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 msgid "HTTP Authorization Request"
 msgstr "HTTP-Autorisierungsanfrage"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 msgid "_No"
 msgstr "_Nein"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
-msgstr "Der Kontakt \"%s\" hat Sie autorisiert, seinen Status zu sehen."
+msgstr "Der Kontakt \"%s\" hat dich autorisiert, seinen Status zu sehen."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 msgid "Subscription Removed"
 msgstr "Abonnement entfernt"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, python-format
-msgid "%s (%s) has removed subscription from you"
-msgstr "Der Kontakt %s (%s) hat das Abonnement zurückgezogen"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
+msgstr "Der Kontakt %(name)s (%(jid)s) hat das Abonnement zurückgezogen"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
-"Der Kontakt wird Ihnen von nun an als offline angezeigt.\n"
-"Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
+"Der Kontakt wird dir von nun an als offline angezeigt.\n"
+"Möchtst du ihn von deiner Kontaktliste entfernen?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s hat die Einladung abgelehnt: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s hat die Einladung abgelehnt"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
-msgstr "Sie wurden von {user} zu {room} eingeladen"
+msgstr "Du wurdest von {user} zu {room} eingeladen"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "Zertifikats-Passwort benötigt"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
-msgstr "Geben Sie das Passwort für das Zertifikat des Kontos %s ein"
+msgstr "Bitte gib das Passwort für das Zertifikat des Kontos %s ein"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
-msgstr "Bitte geben Sie Ihr Passwort für das Konto %s ein"
+msgstr "Bitte gib dein Passwort für das Konto %s ein"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Fehler bei der Dateiübertragung"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 msgid "Remote Contact Stopped Transfer"
 msgstr "Kontakt hat die Dateiübertragung gestoppt"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 msgid "Error Opening File"
 msgstr "Fehler beim Öffnen der Datei"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 msgid "SSL Certificate Error"
 msgstr "SSL-Zertifikatfehler"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Dateiübertragung fehlgeschlagen"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s von %(name)s wurde empfangen."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Die Übertragung der Datei %(filename)s von %(name)s wurde gestoppt."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 "Die Übertragung der Datei %(filename)s von %(name)s ist fehlgeschlagen."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
+msgstr "Du hast die Datei %(filename)s erfolgreich an %(name)s gesendet."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Die Übertragung der Datei %(filename)s an %(name)s wurde gestoppt."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Die Übertragung von %(filename)s an %(name)s ist fehlgeschlagen."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 msgid "Please enter a new username for your local account"
-msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
+msgstr "Bitte gib einen neuen Benutzernamen für dein lokales Konto ein"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s möchte einen Sprachchat beginnen."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Anfrage für Sprachchat"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 msgid "Insecure Connection"
 msgstr "Unsichere Verbindung"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
 "insecure connection method. This means conversations will not be encrypted. "
 "Connecting PLAIN is strongly discouraged."
 msgstr ""
-"Sie sind dabei, eine ungesicherte Verbindung über das Konto %(account)s "
+"Du bist dabei, eine ungesicherte Verbindung über das Konto %(account)s "
 "(%(server)s) aufzubauen. Das bedeutet, dass alle Unterhaltungen "
 "unverschlüsselt übertragen werden. Von unverschlüsselten Verbindungen wird "
 "dringend abgeraten."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr "_Abbruch"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 msgid "_Connect Anyway"
 msgstr "_Trotzdem verbinden"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr "Gajim: IPython Konsole"
 
@@ -2072,7 +2073,8 @@ msgstr "Keine Verbindung verfügbar"
 
 #: gajim/dialog_messages.py:54
 msgid "Your message can not be sent until you are connected."
-msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
+msgstr ""
+"Deine Nachricht kann erst gesendet werden, wenn du wieder verbunden bist."
 
 #: gajim/dialog_messages.py:58
 msgid "XMPP Address Already in List"
@@ -2083,7 +2085,7 @@ msgid ""
 "The XMPP Address you entered is already in the list. Please choose another "
 "one."
 msgstr ""
-"Die eingegebene XMPP-Adresse ist bereits in der Liste. Wählen Sie bitte eine "
+"Die eingegebene XMPP-Adresse ist bereits in der Liste. Bitte wähle eine "
 "andere."
 
 #: gajim/dialog_messages.py:64
@@ -2117,8 +2119,8 @@ msgid ""
 "connected resources. Please deactivate it and try again."
 msgstr ""
 "Die Privatsphären-Liste %s wurde nicht entfernt. Möglicherweise ist sie noch "
-"in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
-"es erneut."
+"in einer deiner Verbindungen aktiv. Bitte deaktiviere diese und versuche es "
+"erneut."
 
 #: gajim/dialog_messages.py:82
 msgid "Invisibility Not Supported"
@@ -2238,15 +2240,15 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Hochladen des Kontaktbildes fehlgeschlagen"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
-"Entweder sind Sie nicht mehr im Gruppenchat \"%(room)s\" oder \"%(nick)s\" "
+"Entweder bist du nicht mehr im Gruppenchat \"%(room)s\" oder \"%(nick)s\" "
 "hat den Gruppenchat verlassen."
 
 #: gajim/gajim_remote.py:55 gajim/common/exceptions.py:70
@@ -2332,7 +2334,7 @@ msgstr "Priorität"
 
 #: gajim/gajim_remote.py:110
 msgid "priority you want to give to the account"
-msgstr "Priorität, die Sie dem Konto geben möchten"
+msgstr "Priorität, die du dem Konto geben möchtest"
 
 #: gajim/gajim_remote.py:112
 msgid ""
@@ -2347,8 +2349,8 @@ msgstr ""
 msgid ""
 "Sends new chat message to a contact in the contact list. Account is optional."
 msgstr ""
-"Sendet eine neue Nachricht an einen Kontakt in ihrer Kontaktliste. Konto ist "
-"optional."
+"Sendet eine neue Nachricht an einen Kontakt in deiner Kontaktliste. Konto "
+"ist optional."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
 msgid "XMPP Address of the contact that will receive the message"
@@ -2368,7 +2370,7 @@ msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 msgid ""
 "Sends a chat message to someone on your contact list. Account is optional."
 msgstr ""
-"Sendet eine Nachricht an jemanden in ihrer Kontaktliste. Konto ist optional."
+"Sendet eine Nachricht an jemanden in deiner Kontaktliste. Konto ist optional."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2381,7 +2383,7 @@ msgstr "Nachrichtenbetreff"
 #: gajim/gajim_remote.py:138
 msgid "Sends new message to a group chat you've joined."
 msgstr ""
-"Sendet eine neue Nachricht an einen Gruppenchat, dem Sie beigetreten sind."
+"Sendet eine neue Nachricht an einen Gruppenchat, dem du beigetreten bist."
 
 #: gajim/gajim_remote.py:140
 msgid "XMPP Address of the group chat that will receive the message"
@@ -2497,7 +2499,7 @@ msgstr ""
 
 #: gajim/gajim_remote.py:229
 msgid "Check if Gajim is running"
-msgstr "Bitte überprüfen Sie, ob Gajim läuft"
+msgstr "Bitte überprüfe, ob Gajim läuft"
 
 #: gajim/gajim_remote.py:255
 msgid "Missing argument \"contact_jid\""
@@ -2509,12 +2511,12 @@ msgid ""
 "'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
-"\"%s\" ist nicht in Ihrer Kontaktliste.\n"
-"Bitte geben Sie ein Konto zum Senden der Nachricht an."
+"\"%s\" ist nicht in deiner Kontaktliste.\n"
+"Bitte gib ein Konto zum Senden der Nachricht an."
 
 #: gajim/gajim_remote.py:278
 msgid "You have no active account"
-msgstr "Sie haben kein aktives Konto"
+msgstr "Du hast kein aktives Konto"
 
 #: gajim/gajim_remote.py:326
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
@@ -2559,7 +2561,7 @@ msgid ""
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Zu viele Parameter. \n"
-"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
+"Gib \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
 #: gajim/gajim_remote.py:442
@@ -2569,80 +2571,75 @@ msgid ""
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Parameter \"%(arg)s\" wurde nicht definiert. \n"
-"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
+"Gib \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, python-format
 msgid "Creating %s"
 msgstr "Erstelle %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Unbekannter SSL-Fehler: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Neue Nachricht von %(nickname)s"
 msgstr[1] "%(n_msgs)i ungelesene Nachrichten von %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 msgid "New Group Chat Message"
 msgstr "Neue Nachricht in einem Gruppenchat"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s hat seinen Status geändert"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s hat sich angemeldet"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s hat sich abgemeldet"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
@@ -2666,7 +2663,7 @@ msgstr ""
 
 #: gajim/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
-msgstr "Zeit in Minuten, nach der Ihr Status auf Abwesend gesetzt wird."
+msgstr "Zeit in Minuten, nach der dein Status auf Abwesend gesetzt wird."
 
 #: gajim/common/config.py:83
 msgid "$S (Away: Idle more than $T min)"
@@ -2681,7 +2678,8 @@ msgstr ""
 
 #: gajim/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
-msgstr "Zeit in Minuten, nach der Ihr Status auf Nicht Verfügbar gesetzt wird."
+msgstr ""
+"Zeit in Minuten, nach der dein Status auf Nicht Verfügbar gesetzt wird."
 
 #: gajim/common/config.py:86
 msgid "$S (Not available: Idle more than $T min)"
@@ -2711,60 +2709,22 @@ msgstr ""
 "Benachrichtigungssymbol nicht angezeigt wird."
 
 #: gajim/common/config.py:93
-msgid "Notification color for contacts signing in."
-msgstr "Farbe der Benachrichtigung, wenn sich ein Kontakt anmeldet."
-
-#: gajim/common/config.py:94
-msgid "Notification color for contacts signing out."
-msgstr "Farbe der Benachrichtigung, wenn sich ein Kontakt abmeldet."
-
-#: gajim/common/config.py:95
-msgid "Notification color for new message notification."
-msgstr "Farbe der Benachrichtigung bei neuen Nachrichten."
-
-#: gajim/common/config.py:96
-msgid "Notification color for file transfer request."
-msgstr "Farbe der Benachrichtigung bei Anfragen zu Dateiübertragungen."
-
-#: gajim/common/config.py:97
-msgid "Notification color for file transfer errors."
-msgstr "Farbe der Benachrichtigung bei Fehlern in der Dateiübertragung."
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-"Farbe der Benachrichtigung bei angehaltenen oder fertiggestellten "
-"Dateiübertragungen."
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr "Farbe der Benachrichtigung für Einladungen zu Gruppenchats."
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr "Hintergrundfarbe der Benachrichtigung bei Statusänderungen."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr "Farbe der Benachrichtigung bei anderen Nachrichten."
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Liste (getrennt durch Leerzeichen) von Ebenen (Konten und Gruppen), die "
 "eingeklappt sind."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "Standard"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr "Sprache der Rechtschreibprüfung."
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2774,15 +2734,15 @@ msgstr ""
 "'sometimes' - Zeige Zeit alle print_ichat_every_foo_minutes Minuten.\n"
 "'never' - Zeige nie die Zeit."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr "Falls aktiviert, werden ASCII Emojis zu grafischen Emojis umgewandelt."
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
@@ -2790,7 +2750,7 @@ msgstr ""
 "Falls aktiviert, wird */_ nicht entfernt. Dadurch wird bspw. *abc* fett "
 "dargestellt, aber die * * werden nicht entfernt."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
@@ -2798,7 +2758,7 @@ msgstr ""
 "Nach dem Spitznamen anzufügendes Zeichen, wenn die Spitznamen-"
 "Vervollständigung (Tab) im Gruppenchat genutzt wird."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
@@ -2806,7 +2766,7 @@ msgstr ""
 "Zeichen, das dem gewünschten Spitznamen angehängt wird, falls dieser im "
 "Gruppenchat bereits vergeben ist."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
@@ -2815,11 +2775,11 @@ msgstr ""
 "speichern und die Position wiederherstellen, sobald die Kontaktliste wieder "
 "angezeigt wird."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr "Kontaktliste im Einzelfenstermodus auf der rechten Seite anzeigen"
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -2828,24 +2788,24 @@ msgid ""
 msgstr ""
 "Hiermit lässt sich der Zeitstempel anpassen, der in Unterhaltungen "
 "dargestellt wird. Zum Beispiel wird \"[%H:%M] \" zu \"[Stunde:Minute] \". "
-"Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" "
+"Weitere Informationen findest du in der Python-Dokumentation zu \"strftime\" "
 "unter: https://docs.python.org/3/library/time.html#time.strftime (Englisch)."
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Zeichen, die in Unterhaltungen vor dem Spitznamen angezeigt werden."
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Zeichen, die in Unterhaltungen nach dem Spitznamen angezeigt werden."
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Falls aktiviert, wird Gajim * und [n] zum Titel des Kontaktlistenfensters "
 "hinzufügen."
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
@@ -2853,34 +2813,34 @@ msgstr ""
 "Anzahl der Nachrichten aus dem Unterhaltungsverlauf, die wiederhergestellt "
 "werden soll wenn ein Tab/Fenster erneut geöffnet wird."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 "Wie weit zurück in der Zeit (in Minuten) der Unterhaltungsverlauf "
 "wiederhergestellt werden soll. -1 bedeutet kein Limit."
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 "Wie viele Sekunden soll gewartet werden, bevor einem Gruppenchat automatisch "
-"erneut beigetreten wird, von dem Sie getrennt worden sind? Setzen Sie den "
-"Wert auf 0, um das automatische Wiederbeitreten zu deaktivieren."
+"erneut beigetreten wird, von dem du getrennt worden bist? Setze den Wert auf "
+"0, um das automatische Wiederbeitreten zu deaktivieren."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Sende Nachricht mit Strg+Enter und füge mit Enter einen Zeilenumbruch ein."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
 "Wie viele Zeilen für den Befehl Strg+BildAuf (zuvor gesendete Nachrichten) "
 "gespeichert werden."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -2889,13 +2849,13 @@ msgstr ""
 "Entweder eine benutzerdefinierte URL, die %%s enthält (wobei %%s das Wort "
 "oder der Satz ist) oder \"WIKTIONARY\" (Wiktionary-Wörterbuch verwenden)."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert "
 "werden."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
@@ -2903,15 +2863,15 @@ msgstr ""
 "Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll (\"print_time"
 "\"==sometimes), wird sie alle x Minuten angezeigt."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr "Fragen, bevor ein Bild aus der Zwischenablage eingefügt wird."
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Gruppenchat-Tab/Fenster geschlossen wird."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
@@ -2920,7 +2880,7 @@ msgstr ""
 "dadurch Daten verloren gehen würden (Chat, Privatchat, nicht minimierter "
 "Gruppenchat)."
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
@@ -2929,31 +2889,31 @@ msgstr ""
 "Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Hostnamen "
 "gesendet werden."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Der IEC-Standard legt fest: 1 KiB = 1024 Byte, 1 kB = 1000 Byte."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Neue Ereignisse per Benachrichtigungssymbol anzeigen."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Tab-Leiste bei einzelner Unterhaltung anzeigen?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenzen im Chatfenster anzeigen?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Vorschau neuer Nachrichten in der Benachrichtigung anzeigen?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
@@ -2961,7 +2921,7 @@ msgstr ""
 "Eine durch Semikola getrennte Liste von Worten, die in einem Gruppenchat "
 "hervorgehoben werden sollen."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
 "This setting is taken into account only if the notification area icon is "
@@ -2971,7 +2931,7 @@ msgstr ""
 "Fensters geklickt wird. Diese Option funktioniert nur, wenn das "
 "Benachrichtigungssymbol verwendet wird."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
@@ -2979,15 +2939,7 @@ msgstr ""
 "Falls aktiviert, versteckt Gajim die Kontaktliste beim Klick auf die X-"
 "Schaltfläche, anstatt sie in den Benachrichtigungsbereich zu minimieren."
 
-#: gajim/common/config.py:204
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Falls aktiviert, wird auf jedem Tab mit ungelesenen Nachrichten ein Icon "
-"angezeigt. Abhängig vom Design kann dieses Icon auch animiert sein."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
 "the contact name in the contact list window."
@@ -2996,14 +2948,14 @@ msgstr ""
 "Kontaktes dessen Statusnachricht angezeigt, sofern dieser eine festgelegt "
 "hat."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Legt die Position des Kontaktbildes in der Kontaktliste fest. Mögliche "
 "Optionem sind \"left\" (links) oder \"right\" (rechts)."
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
 "contact changes their status (and/or their status message)."
@@ -3011,7 +2963,7 @@ msgstr ""
 "Falls deaktiviert, wird Gajim keine Statusnachricht im Chat anzeigen, wenn "
 "ein Kontakt den Status oder die Statusnachricht ändert."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
@@ -3019,7 +2971,7 @@ msgstr ""
 "Standardeinstellung: Status-Benachrichtigung für jedes Beitreten oder "
 "Verlassen in einem Gruppenchat anzeigen."
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
@@ -3027,11 +2979,11 @@ msgstr ""
 "Standardeinstellung: Statusnachricht für jede Statusänderung (abwesend, "
 "nicht stören, etc.) von Teilnehmern eines Gruppenchats anzeigen."
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
 "Window Managers) when holding pending events."
@@ -3039,7 +2991,7 @@ msgstr ""
 "Falls aktiviert, blinkt das Fenster bei neuen Ereignissen (Standardverhalten "
 "der meisten Fenster-Manager)."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3060,7 +3012,7 @@ msgstr ""
 "\"pertype\" - Jeder Nachrichtentyp (z.B. Chat oder Gruppenchat) landet in "
 "einem eigenen Fenster."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3072,27 +3024,27 @@ msgstr ""
 "\"never\" - Kontaktliste nie anzeigen.\n"
 "\"last_state\" - Letzten Zustand wiederherstellen."
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Falls aktiviert, wird das Kontaktbild im Chatfenster angezeigt."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Falls aktiviert, schließt die Escape-Taste aktive Tabs/Fenster."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 msgid "Hides the banner in a group chat window."
 msgstr "Versteckt den Banner im Gruppenchat-Fenster."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Versteckt den Banner im Einzelchat-Fenster."
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Versteckt die Teilnehmerliste im Gruppenchat-Fenster."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking as in the previous message."
@@ -3100,13 +3052,13 @@ msgstr ""
 "Der Spitzname wird im Chat nur dann vor einer Nachricht angezeigt, wenn sie "
 "nicht von der Person stammt, die schon die letzte Nachricht geschrieben hat."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen "
 "verwendet wird."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
@@ -3114,33 +3066,33 @@ msgstr ""
 "Strg+Tab wechselt zum nächsten Tab, wenn kein anderer Tab ungelesene "
 "Nachrichten enthält."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
-"Soll ein Bestätigungsdialog zum Erstellen von Metakontakten angezeigt "
-"werden? Bei einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
+"Soll nach einer Bestätigung beim Erstellen von Metakontakten gefragt werden? "
+"Bei einer leeren Zeichenfolge wird nicht gefragt."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
-"Soll ein Bestätigungsdialog zum Sperren von Kontakten angezeigt werden? Bei "
-"einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
+"Soll nach einer Bestätigung beim Sperren von Kontakten gefragt werden? Bei "
+"einer leeren Zeichenfolge wird nicht gefragt."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
-"Falls aktiviert, können Sie eine negative Priorität für Ihr Konto im "
-"Kontobearbeitungsfenster setzen. VORSICHT: Wenn Sie mit einer negativen "
-"Priorität angemeldet sind, erhalten Sie KEINE Nachrichten mehr vom Server."
+"Falls aktiviert, kannst du eine negative Priorität für dein Konto im "
+"Kontobearbeitungsfenster setzen. VORSICHT: Wenn du mit einer negativen "
+"Priorität angemeldet bist, erhälst du KEINE Nachrichten mehr vom Server."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
@@ -3148,7 +3100,7 @@ msgstr ""
 "Falls aktiviert, werden die Anzahl angemeldeter und die Gesamtanzahl der "
 "Kontakte auf Konto- und Gruppenebene angezeigt."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
@@ -3157,12 +3109,12 @@ msgstr ""
 "auswählen, welcher die letzte Nachricht geschickt hat, falls das Chatfenster "
 "nicht bereits geöffnet ist."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Wartezeit, bevor das \"Status ändern\"-Fenster automatisch geschlossen wird."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3170,11 +3122,7 @@ msgstr ""
 "Maximale Anzahl von Zeilen, die in einem Gespräch dargestellt werden. Die "
 "ältesten Zeilen werden ausgeblendet."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Legen Sie den Zeitabstand zwischen zwei Leerlaufüberprüfungen fest."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
@@ -3182,29 +3130,29 @@ msgstr ""
 "Gültige URI-Schemata. Nur Schemata in dieser Liste werden als \"wirkliche\" "
 "URIs akzeptiert. (mailto und xmpp werden separat behandelt)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Falls aktiviert, wird sich die Autovervollständigung in Gruppenchats ähnlich "
 "der Autovervollständigung in einer Kommandozeile verhalten."
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Bildwiederholrate der Jingle-Videoausgabe optional korrigieren. Beispiel: "
 "10/1 oder 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Jingle-Videoausgabegröße optional ändern. Beispiel: 320x240."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
-"Falls aktiviert, werden Sie den Videostream Ihrer Webcam ebenfalls sehen."
+"Falls aktiviert, wirst du den Videostream deiner Webcam ebenfalls sehen."
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
@@ -3213,11 +3161,11 @@ msgstr ""
 "verwenden. Entweder jenen in der \"stun_server\"-Option oder einen vom XMPP-"
 "Server vorgegebenen Server."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr "Für Jingle zu benutzender STUN-Server"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
@@ -3226,7 +3174,7 @@ msgstr ""
 "Gruppenchat anzeigen, indem ein farbiges Quadrat zum Status-Icon hinzugefügt "
 "wird."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
@@ -3234,13 +3182,13 @@ msgstr ""
 "Proxy, der für alle ausgehenden Verbindungen verwendet wird, wenn das Konto "
 "keine eigene Proxy-Konfiguration hat."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
-"Falls aktiviert, wird Gajim Nachrichten ignorieren, die versuchen Ihre "
+"Falls aktiviert, wird Gajim Nachrichten ignorieren, die versuchen deine "
 "Aufmerksamkeit zu erregen (\"wizz\")."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3248,7 +3196,7 @@ msgstr ""
 "Falls aktiviert, wird Gajim Fenster die beim letzten Beenden geöffnet waren "
 "wieder öffnen."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
@@ -3256,32 +3204,28 @@ msgstr ""
 "Falls aktiviert, zeigt Gajim eine Empfangsbestätigung an, wenn die Nachricht "
 "vom Gegenüber empfangen wurde."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr "Kleines Kontaktbild in Chatfenster-Tabs und im Fenstersymbol anzeigen."
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Falls aktiviert, wird Gajim den Schlüsselbund des Systems verwenden, um die "
 "Konto-Passwörter zu speichern."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Falls aktiviert, wird Gajim XEP-0146-Befehle ausführen."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: System, 1: Aktiviert, 0: Deaktiviert"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 "Wert in Tagen, der im Menü für die Synchronisationsbegrenzung gewählt werden "
 "kann"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
@@ -3289,7 +3233,7 @@ msgstr ""
 "Maximaler Unterhaltungsverlauf in Tagen, der aus dem Archiv eines "
 "öffentlichen Gruppenchats angefordert wird. 0: So viel wie möglich."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
@@ -3297,7 +3241,7 @@ msgstr ""
 "Maximaler Unterhaltungsverlauf in Tagen, der aus dem Archiv eines privaten "
 "Gruppenchats angefordert wird. 0: So viel wie möglich."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
@@ -3305,7 +3249,7 @@ msgstr ""
 "Falls aktiviert, wird Gajim das Thema des Gruppenchats beim Beitreten im "
 "Chatfenster anzeigen."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
@@ -3313,7 +3257,7 @@ msgstr ""
 "Falls aktiviert, wird die Kontakt-Ebene dem Chatstatus des Kontakts "
 "entsprechend gefärbt."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
@@ -3321,7 +3265,7 @@ msgstr ""
 "Falls aktiviert, wird der Tab dem Chatstatus des Kontakts entsprechend "
 "gefärbt."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
@@ -3329,7 +3273,7 @@ msgstr ""
 "Zeigt einen Text im Banner, der den aktuellen Chatstatus des Kontakts "
 "beschreibt."
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
@@ -3337,7 +3281,7 @@ msgstr ""
 "Chatstatus-Benachrichtigungen, die an Kontakte gesendet werden. Mögliche "
 "Optionen sind \"all\", \"composing_only\" oder \"disabled\"."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
@@ -3345,37 +3289,43 @@ msgstr ""
 "Chatstatus-Benachrichtigungen, die an den Gruppenchat gesendet werden "
 "sollen. Mögliche Optionen sind \"all\", \"composing_only\" oder \"disabled\"."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr "API-Einstellungen. Mögliche Werte: \"http\", \"iq\""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr "Das Auswählen von Text kopiert diesen in die Zwischenablage"
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 "Falls aktiviert, wird Gajim Befehle im Chatfenster ausführen (/show, /sh, /"
 "execute, /exec)."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr "Breite der Kontaktliste im Gruppenchat in Pixel"
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 msgid "Force Bookmark 2 usage"
 msgstr "Benutzung von Bookmarks 2 erzwingen"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+"Zeigt eine Infoleiste mit hilfreichen Hinweisen im Chat starten / beitreten "
+"Fenster"
+
+#: gajim/common/config.py:269
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr ""
-"Die Priorität ändert sich automatisch gemäß Ihrem Status. Die Prioritäten "
-"werden in den \"autopriority_*\"-Optionen festgelegt."
+"Die Priorität ändert sich automatisch und richtet sich nach deinem Status. "
+"Die Prioritäten werden in den \"autopriority_*\"-Optionen festgelegt."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
@@ -3385,18 +3335,18 @@ msgstr ""
 "\"away\", \"xa\" oder \"dnd\". HINWEIS: Diese Option kann nur verwendet "
 "werden, wenn \"restore_last_status\" deaktiviert ist."
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr "Falls aktiviert, wird er zuletzt verwendete Status wiederhergestellt."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Falls aktiviert, werden Autorisierungsanfragen von Kontakten automatisch "
 "akzeptiert."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
@@ -3404,11 +3354,11 @@ msgstr ""
 "Falls deaktiviert, wird das Konto deaktiviert und nicht in der Kontaktliste "
 "erscheinen."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 msgid "Use an unencrypted connection to the server"
 msgstr "Eine unverschlüsselte Verbindung zum Server verwenden"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
@@ -3416,25 +3366,25 @@ msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine unverschlüsselte "
 "Verbindung übertragen wird. Mögliche Optionen sind \"warn\" oder \"none\"."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr "Liste der zu ignorierenden SSL-Fehler (getrennt durch Leerzeichen)."
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr "Verbindungstyp: START TLS, DIRECT TLS oder PLAIN"
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 "Durch Leerzeichen getrennte Liste von XMPP-Adressen, für die kein "
-"Unterhaltungsverlauf gespeichert werden soll. Sie können auch einen "
+"Unterhaltungsverlauf gespeichert werden soll. Du kannst auch einen "
 "Kontonamen verwenden, um für das gesamte Konto nichts zu speichern."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
@@ -3442,16 +3392,16 @@ msgstr ""
 "Wie viele Sekunden auf eine Ping-Antwort gewartet werden soll, bevor ein "
 "neuer Verbindungsversuch gestartet wird."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
 "'file_transfer_proxies' option for file transfers."
 msgstr ""
-"Falls aktiviert, wird Gajim Ihre IP-Adresse und die in der "
+"Falls aktiviert, wird Gajim deine IP-Adresse und die in der "
 "\"file_transfer_proxies\"-Option definierten Proxies für den Dateitransfer "
 "verwenden."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
@@ -3460,33 +3410,33 @@ msgstr ""
 "testen, um deren Funktion sicherzustellen. Es ist bekannt, dass dieser Test "
 "bei Openfire-Proxies immer fehlschlägt, auch wenn sie funktionieren."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Falls aktiviert, wird Gajim Anfragen zur Empfangsbestätigung beantworten."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
-msgstr "Erlaubt Gajim, Informationen über Ihr Betriebssystem zu übermitteln."
+msgstr "Erlaubt Gajim, Informationen zu deinem Betriebssystem zu übermitteln."
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
-msgstr "Erlaubt Gajim, Ihre lokale Zeit zu übermitteln."
+msgstr "Erlaubt Gajim, deine lokale Zeit zu übermitteln."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 msgid "Message that is sent to contacts you want to add."
-msgstr "Nachricht, die an Kontakte gesendet wird, die Sie hinzufügen wollen."
+msgstr "Nachricht, die an Kontakte gesendet wird, die du hinzufügen willst."
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
 "your machine for file transfers."
 msgstr ""
-"Falls aktiviert, wird Gajim ihre lokale IP an Kontakte schicken, um "
+"Falls aktiviert, wird Gajim deine lokale IP an Kontakte schicken, um "
 "Dateiübertragungen zu ermöglichen."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
@@ -3494,11 +3444,7 @@ msgstr ""
 "Durch Leerzeichen getrennte Liste von XMPP-Adressen, für welche das "
 "Chatfenster beim nächsten Start wieder geöffnet werden soll."
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr "HTTP Datei-Upload: HTTPS-Zertifikat verifizieren."
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
@@ -3506,11 +3452,11 @@ msgstr ""
 "Bevorzugte Methode für Dateiübertragungen per Ziehen und Ablegen auf das "
 "Chatfenster. Zur Verfügung stehen \"httpupload\" (Standard) oder \"jingle\"."
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr "Erlaube Zertifikatsverifizierung mittels POSH."
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
@@ -3518,18 +3464,18 @@ msgstr ""
 "Chatstatus-Benachrichtigungen, die an Kontakte gesendet werden. Mögliche "
 "Optionen sind \"all\", \"composing_only\" oder \"disabled\"."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 msgid "The currently active encryption for that contact."
 msgstr "Die derzeit aktive Verschlüsselung für diesen Kontakt."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 "Falls aktiviert, wird für jede Nachricht in diesem Gruppenchat eine "
 "Benachrichtigung angezeigt."
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
@@ -3537,13 +3483,13 @@ msgstr ""
 "Statusnachricht für jede Statusänderung (abwesend, nicht stören, etc.) von "
 "Nutzern in einem Gruppenchat anzeigen."
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 msgid "Show a status message for every join or leave in a group chat."
 msgstr ""
 "Status-Benachrichtigung für jedes Beitreten oder Verlassen in einem "
 "Gruppenchat anzeigen."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
@@ -3551,7 +3497,7 @@ msgstr ""
 "Falls aktiviert, wird der Gruppenchat beim automatischen Beitreten in die "
 "Kontaktliste minimiert."
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
@@ -3559,7 +3505,7 @@ msgstr ""
 "Falls aktiviert, wird der Gruppenchat beim Schließen in die Kontaktliste "
 "minimiert."
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
@@ -3567,7 +3513,7 @@ msgstr ""
 "Chatstatus-Benachrichtigungen, die an den Gruppenchat gesendet werden "
 "sollen. Mögliche Optionen sind \"all\", \"composing_only\" oder \"disabled\"."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
@@ -3575,1126 +3521,1126 @@ msgid ""
 msgstr ""
 "Falls aktiviert, werden Plugins beim Starten aktiviert (wird beim Beenden "
 "von Gajim gespeichert). Diese Option SOLLTE NICHT benutzt werden, um Plugins "
-"zu (de-)aktivieren. Benutzen Sie dafür stattdessen die GUI."
+"zu (de-)aktivieren. Benutze dafür stattdessen die Plugin-Verwaltung."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Essen"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 msgid "I'm eating."
 msgstr "Ich esse gerade."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Arbeiten"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Ich telefoniere gerade."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Draußen"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "'muc_highlight_words' or your nickname is mentioned."
 msgstr ""
 "Abzuspielender Klang, wenn eine Gruppenchat-Nachricht eines der Wörter aus "
-"der \"muc_highlights_words\"-Liste oder Ihren Spitznamen enthält."
+"der \"muc_highlights_words\"-Liste oder deinen Spitznamen enthält."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 msgid "Sound to play when any group chat message arrives."
 msgstr ""
 "Klang, der bei einer neuen Gruppenchat-Nachricht abgespielt werden soll."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 msgid "?Group chat name:Team"
 msgstr "Team"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr "Projektdiskussion"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 msgid "?Group chat address:team"
 msgstr "team"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 msgid "?Group chat name:Family"
 msgstr "Familie"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr "Treffen im Frühjahr"
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr "familie"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 msgid "?Group chat name:Vacation"
 msgstr "Urlaub"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr "Reiseplanung"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 msgid "?Group chat address:vacation"
 msgstr "urlaub"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 msgid "?Group chat name:Repairs"
 msgstr "Reparaturen"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr "Lokale Selbsthilfegruppe"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 msgid "?Group chat address:repairs"
 msgstr "reparaturen"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 msgid "?Group chat name:News"
 msgstr "Nachrichten"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 msgid "?Group chat description:Local news and reports"
 msgstr "Lokale Nachrichten und Berichte"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 msgid "?Group chat address:news"
 msgstr "nachrichten"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 msgid "Remote server not found"
 msgstr "Server nicht gefunden"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr "Server Zeitüberschreitung"
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
 msgstr "Unter dieser Adresse befindet sich kein Gruppenchat-Server"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 msgid "Group chat already exists"
 msgstr "Gruppenchat ist bereits vorhanden"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
 msgstr "Gruppenchat existiert nicht"
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 msgid "Group chat is closed"
 msgstr "Gruppenchat wurde aufgelöst"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 "Diese Nachricht wurde mit OTR verschlüsselt und konnte nicht entschlüsselt "
 "werden."
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 "Diese Nachricht wurde mit Legacy-OpenPGP verschlüsselt und konnte nicht "
-"entschlüsselt werden. Sie können das PGP-Plugin installieren, das solche "
+"entschlüsselt werden. Du kannst das PGP-Plugin installieren, das solche "
 "Nachrichten verarbeiten kann."
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 "Diese Nachricht wurde mit OpenPGP für XMPP verschlüsselt und konnte nicht "
-"entschlüsselt werden. Sie können das OpemPGP-Plugin installieren, das solche "
+"entschlüsselt werden. Du kannst das OpenPGP-Plugin installieren, das solche "
 "Nachrichten verarbeiten kann."
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 "Diese Nachricht wurde mit %s verschlüsselt und konnte nicht entschlüsselt "
 "werden."
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Haushalt erledigen"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Lebensmittel einkaufen"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Putzen"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Kochen"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Instandhaltung"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Geschirrspülen"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Wäschewaschen"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Gartenarbeit"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Besorgungen machen"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Mit dem Hund draußen"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Etwas trinken"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Bier trinken"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Kaffee trinken"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Tee trinken"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Zwischenmahlzeit"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Frühstücken"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Abendessen"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Mittagessen"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Sport machen"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Radfahren"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Tanzen"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Wandern"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Joggen"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Beim Sport"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Laufen"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Skifahren"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Schwimmen"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Trainieren"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Körperpflege"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "Im Bad"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Zähneputzen"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Beim Frisör"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Rasieren"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Ein Bad nehmen"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Unter der Dusche"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Termin"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Freier Tag"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Rumhängen"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Verstecken"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Beten"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Geplanter Urlaub"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Nachdenken"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Entspannen"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Angeln"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Spielen"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Ausgehen"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Feiern"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Lesen"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Studieren"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Shoppen"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Rauchen"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Unter Leuten"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Sonnenbaden"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Fernsehen"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Film schauen"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Im Gespräch"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "Im echten Leben"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Am Videotelefon"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Reisen"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Pendeln"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Fahren"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "Im Auto"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "Im Bus"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "Im Flugzeug"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Im Zug"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Auf einer Reise"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Spazierengehen"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programmieren"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "In einer Besprechung"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Lernen"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Schreiben"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Verängstigt"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Verblüfft"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Verliebt"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Wütend"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Ärgerlich"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Ängstlich"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Erregt"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Beschämt"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Tapfer"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Gelassen"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Vorsichtig"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Kalt"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Zuversichtlich"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Verwirrt"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Nachdenklich"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Zufrieden"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Reizbar"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Verrückt"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Kreativ"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Neugierig"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Niedergeschlagen"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Deprimiert"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Enttäuscht"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Angewidert"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Betroffen"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Abgelenkt"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Verlegen"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Neidisch"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Kokett"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustriert"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Dankbar"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Bekümmert"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Mürrisch"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Schuldbewusst"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Fröhlich"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Hoffnungsvoll"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Heiß"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Demütig"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Gedemütigt"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Hungrig"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Verletzt"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Beeindruckt"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Bewundernd"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Verliebt"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Entrüstet"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Interessiert"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Berauscht"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Unbesiegbar"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Neidisch"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Einsam"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Verloren"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Glücklich"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Gemein"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Launisch"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervös"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Beleidigt"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Empört"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Scherzhaft"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Stolz"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Entspannt"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Erleichtert"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Reuevoll"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Ruhelos"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Traurig"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarkastisch"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Zufrieden"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Ernst"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Geschockt"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Schüchtern"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Krank"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Müde"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Gestresst"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Stark"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Überrascht"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Dankbar"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Durstig"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Müde"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Schwach"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Besorgt"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "Genauigkeit"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "Höhe"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "Gebiet"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "Peilung"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "Gebäude"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "Land"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "Landeskürzel"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "Datum"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "Beschreibung"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "Fehler"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "Etage"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "Breitengrad"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "Ortschaft"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "Länge"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "Postleitzahl"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "Region"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "Raum"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "Geschwindigkeit"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "Straße"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "Text"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "Zeitstempel"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Das Zertifikat des Ausstellers ist nicht verfügbar"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Die Zertifikats-CRL ist nicht verfügbar"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Die Signatur des Zertifikats konnte nicht entschlüsselt werden"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Die CRL-Unterschrift konnte nicht entschlüsselt werden"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr ""
 "Der öffentliche Schlüssel des Ausstellers konnte nicht decodiert werden"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Fehler in der Zertifikat-Unterschrift"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Fehler bei der CRL-Unterschrift"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Zertifikat ist noch nicht gültig"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Zertifikat ist abgelaufen"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL ist nocht nicht gültig"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL ist abgelaufen"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatfehler im \"notBefore\"-Feld des Zertifikats"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatfehler im \"notAfter\"-Feld des Zertifikats"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatfehler im \"lastUpdate\"-Feld der CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatfehler im \"nextUpdate\"-Feld der CRL"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Zu wenig Speicher"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Selbstsigniertes Zertifikat in der Zertifikatskette"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Das Zertifikat des lokalen Ausstellers ist nicht verfügbar"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Das erste Zertifikat konnte nicht überprüft werden"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Zertifikatskette zu lang"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Zertifikat wurde widerrufen"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Ungültiges CA-Zertifikat"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Pfadlängenbeschränkung überschritten"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Nicht unterstützter Verwendungszweck für das Zertifikat"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Zertifikat abgelehnt"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Themenaussteller unpassend"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Zertifizierungsstelle und Betreffsschlüssel unpassend"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 "Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
 "Zertifikats"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen des Programms"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr "Zertifizierungsstelle ist nicht bekannt"
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 msgid "The certificate has been revoked"
 msgstr "Zertifikat wurde widerrufen"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr "Zertifikat stimmt nicht mit der erwarteten Identität der Seite überein"
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr "Algorithmus des Zertifikats ist unsicher"
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr "Aktivierungszeitpunkt des Zertifikats liegt in der Zukunft"
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 msgid "Unknown validation error"
 msgstr "Unbekannter Fehler bei der Überprüfung"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 msgid "The certificate has expired"
 msgstr "Zertifikat ist abgelaufen"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 msgid "Authentication aborted"
 msgstr "Authentifizierung gescheitert"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 msgid "Account disabled"
 msgstr "Konto deaktiviert"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 msgid "Credentials expired"
 msgstr "Zugangsdaten abgelaufen"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 msgid "Encryption required"
 msgstr "Verschlüsselung erforderlich"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 msgid "Authentication mechanism not supported"
 msgstr "Authentifizierungsmechanismus nicht unterstützt"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 msgid "Authentication mechanism too weak"
 msgstr "Authentifizierungsmechanismus zu schwach"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr "Authentifizierung derzeit nicht möglich"
 
@@ -4755,12 +4701,12 @@ msgstr "Windows"
 msgid "macOS"
 msgstr "macOS"
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s Konfigurationsfehler"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4771,7 +4717,7 @@ msgid ""
 "Error was:\n"
 "%(error)s"
 msgstr ""
-"Konnte %(text)s nicht einrichten. Überprüfen Sie Ihre Konfiguration.\n"
+"Konnte %(text)s nicht einrichten. Überprüfe die Konfiguration.\n"
 "\n"
 "Pipeline war:\n"
 "%(pipeline)s\n"
@@ -4779,285 +4725,244 @@ msgstr ""
 "Fehler war:\n"
 "%(error)s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "Audio-Eingabegerät"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "Audio-Ausgabegerät"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "Video-Aufnahmegerät"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Der Servername muss zwischen 1 und 1023 Zeichen lang sein"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Ungültiges Zeichen im Hostname."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Server-Adresse benötigt."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Der Benutzername muss zwischen 1 und 1023 Zeichen lang sein"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Ungültiges Zeichen im Benutzernamen."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "Der Name der XMPP-Ressource muss zwischen 1 und 1023 Zeichen lang sein"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Ungültiges Zeichen in der XMPP-Ressource."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "Verfügb_ar"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "Verfügbar"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Abwesend"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Unbekannt"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Hat Fehler"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Keines"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "An"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Von"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Beide"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Keine Kontaktanfrage"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Kontaktanfrage"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Keine"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Besucher"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Besucher"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Keine"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 msgid "Owners"
-msgstr "Besitzer"
+msgstr "Eigentümer"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
-msgstr "Besitzer"
+msgstr "Eigentümer"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 msgid "Administrators"
 msgstr "Administratoren"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 msgid "Members"
 msgstr "Mitglieder"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Mitglied"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 msgid "is composing a message…"
 msgstr "schreibt…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "schreibt nicht mehr"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster geschlossen"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, python-format
 msgid "from group chat %s"
 msgstr "aus dem Gruppenchat %s"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr "vom Benutzer %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "von %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d neues Ereignis"
 msgstr[1] "%d neue Ereignisse"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
-msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen."
+msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Hallo, Ich bin $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Konnte Bild nicht laden"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "PyCURL ist nicht installiert"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "Fehler beim Laden des Bildes"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s ist eine Datei, sollte aber ein Verzeichnis sein"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
@@ -5068,9 +4973,9 @@ msgid ""
 "gajim.org/gajim/gajim/wikis/help/DatabaseBackup) or remove it (all history "
 "will be lost)."
 msgstr ""
-"Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
-"reparieren (Dokumentation in Englisch https://dev.gajim.org/gajim/gajim/"
-"wikis/help/DatabaseBackup) oder zu löschen (dabei gehen alle "
+"Die Datenbankdatei (%s) konnte nicht gelesen werden. Du kannst versuchen, "
+"sie zu reparieren (Dokumentation in Englisch https://dev.gajim.org/gajim/"
+"gajim/wikis/help/DatabaseBackup) oder zu löschen (dabei gehen alle "
 "Unterhaltungsverläufe verloren)."
 
 #: gajim/common/exceptions.py:59
@@ -5085,7 +4990,7 @@ msgid ""
 "Try reading %(url)s"
 msgstr ""
 "Session-Bus ist nicht verfügbar.\n"
-"Bitte lesen Sie %(url)s"
+"Bitte lies hierzu %(url)s"
 
 #: gajim/common/exceptions.py:93
 #, python-format
@@ -5094,7 +4999,7 @@ msgid ""
 "Try reading %(url)s"
 msgstr ""
 "System-Bus ist nicht verfügbar.\n"
-"Bitte lesen Sie %(url)s"
+"Bitte lies hierzu %(url)s"
 
 #: gajim/common/zeroconf/connection_zeroconf.py:251
 #, python-format
@@ -5103,7 +5008,7 @@ msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
 
 #: gajim/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
-msgstr "Bitte überprüfen Sie, ob Avahi oder Bonjour installiert sind."
+msgstr "Bitte überprüfe, ob Avahi oder Bonjour installiert sind."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:262
 #: gajim/common/zeroconf/connection_zeroconf.py:266
@@ -5117,7 +5022,7 @@ msgstr "Die Bildung an Port %d ist fehlgeschlagen."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:267
 msgid "Please check if avahi/bonjour-daemon is running."
-msgstr "Bitte überprüfen Sie, ob der avahi/bonjour-Dienst läuft."
+msgstr "Bitte überprüfe, ob der avahi/bonjour-Dienst läuft."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:361
 #: gajim/common/zeroconf/connection_zeroconf.py:374
@@ -5128,7 +5033,7 @@ msgstr "Der Status des Kontos \"%s\" konnte nicht geändert werden"
 #: gajim/common/zeroconf/connection_zeroconf.py:362
 #: gajim/common/zeroconf/connection_zeroconf.py:375
 msgid "Please check if avahi-daemon is running."
-msgstr "Bitte überprüfen Sie, ob der avahi-Dienst läuft."
+msgstr "Bitte überprüfe, ob der avahi-Dienst läuft."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:398
 msgid "Your message could not be sent."
@@ -5136,7 +5041,7 @@ msgstr "Die Nachricht konnte nicht gesendet werden."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:413
 msgid "Contact is offline. Your message could not be sent."
-msgstr "Der Kontakt ist offline. Ihre Nachricht konnte nicht gesendet werden."
+msgstr "Der Kontakt ist offline. Deine Nachricht konnte nicht gesendet werden."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:435
 msgid ""
@@ -5161,82 +5066,82 @@ msgstr "Computer geht in den Ruhezustand"
 msgid "Disconnect from the network"
 msgstr "Verbindung mit dem Netzwerk trennen"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
-msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen."
+msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Datei existiert nicht"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr "Die Datei ist zu groß, maximal erlaubt ist: %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 msgid "Encrypting file…"
 msgstr "Datei wird verschlüsselt…"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr "Fordere Slot für HTTP Datei-Upload an…"
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr "Sende via HTTP Datei-Upload…"
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Statusinformation ändern"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Status ändern"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Online-Status und Beschreibung festlegen"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Frei zum Chatten"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Online"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Längere Zeit abwesend"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Bitte nicht stören"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Offline - Abgemeldet"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Beschreibung des Online-Status:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Der Status hat sich verändert."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Kontakt gesendet: \"%(jid)s\" (%(name)s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Gesendete Kontakte:"
 
@@ -5259,7 +5164,7 @@ msgid "Join Automatically"
 msgstr "Automatisch beitreten"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Konto"
 
@@ -5269,7 +5174,7 @@ msgstr "Gruppenchat"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 msgid "Password"
 msgstr "Passwort"
 
@@ -5289,7 +5194,7 @@ msgstr "Kürzlich besuchte Gruppenchats"
 msgid "Search group chats on selected server"
 msgstr "Gruppenchats auf dem ausgewählten Server suchen"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
 msgstr "Beitreten"
 
@@ -5306,17 +5211,17 @@ msgid "Time remaining"
 msgstr "Verbleibende Zeit"
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
@@ -5456,7 +5361,7 @@ msgstr "Zertifikatsinformationen kopieren"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -5635,42 +5540,49 @@ msgstr "Arbeit"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Über"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+"Starte einen neuen Chat, tritt einem Gruppenchat bei oder suche weltweit "
+"nach neuen Gruppenchats. Du kannst auch eine XMPP-Adresse eingeben."
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 msgid "Global Group Chat Search"
-msgstr "Globale Suche nach Gruppenchats"
+msgstr "Weltweite Suche nach Gruppenchats"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 msgid "_Back"
 msgstr "_Zurück"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Beitreten"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
 msgstr "Konto auswählen"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr "_Auswählen"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
 msgstr ""
-"Keine Kontakte gefunden\n"
-"Sie können auch eine XMPP-Adresse eingeben"
+"Keine Kontakte gefunden.\n"
+"Du kannst auch eine XMPP-Adresse eingeben."
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
@@ -5716,7 +5628,7 @@ msgstr ""
 #: gajim/data/gui/filetransfers.ui:207
 msgid "Shows a list of file transfers between you and your contacts"
 msgstr ""
-"Zeigt eine Liste der Dateiübertragungen zwischen Ihnen und Ihren Kontakten"
+"Zeigt eine Liste der Dateiübertragungen zwischen dir und deinen Kontakten"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
 msgid "Bold"
@@ -5735,6 +5647,7 @@ msgid "Strike"
 msgstr "Durchgestrichen"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Farbe"
 
@@ -5746,117 +5659,113 @@ msgstr "Schriftart"
 msgid "Clear formatting"
 msgstr "Formatierung löschen"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 msgid "Choose encryption"
 msgstr "Verschlüsselung auswählen"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Zeigt eine Übersicht der Emojis (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 msgid "Joining…"
 msgstr "Trete bei…"
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 msgid "Enter new nickname"
 msgstr "Neuen Spitznamen eingeben"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 msgid "Ch_ange"
 msgstr "Ä_ndern"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Thema ändern"
+
+#: gajim/data/gui/groupchat_control.ui:786
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 msgid "_Leave Group Chat"
 msgstr "Gruppenchat _verlassen"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 msgid "Gajim will not try to join this group chat again"
 msgstr "Gajim wird nicht mehr versuchen dem Gruppenchat beizutreten"
 
-#: gajim/data/gui/groupchat_control.ui:1018
-msgid "An error occured"
+#: gajim/data/gui/groupchat_control.ui:1063
+msgid "An error occurred"
 msgstr "Es ist ein Fehler aufgetreten"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr "_Erneut versuchen"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 msgid "Kick participant"
 msgstr "Teilnehmer rauswerfen"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Rauswerfen"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr "Emoji einfügen"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr "Begründung (optional)"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 msgid "Ban participant"
 msgstr "Teilnehmer sperren"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "S_perren"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 msgid "Destroy group chat"
 msgstr "Gruppenchat auflösen"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 msgid "_Destroy"
 msgstr "_Auflösen"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr "Alternativer Gruppenchat (optional)..."
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 msgid "Reason (optional)..."
 msgstr "Begründung (optional)..."
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr "Grund für die Auflösung"
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr "Alternativer Gruppenchat für die Teilnehmer"
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
-msgstr "Geben Sie einen neuen Namen für diesen Gruppenchat ein"
+msgstr "Gib einen neuen Namen für diesen Gruppenchat ein"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 msgid "_Invite"
 msgstr "_Einladen"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Ereignisarten"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Ereignisbeschreibung"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -5939,18 +5848,18 @@ msgid "Add"
 msgstr "Hinzufügen"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 msgid "Remove"
 msgstr "Entfernen"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 msgid "Resource"
 msgstr "XMPP-Ressource"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -5959,7 +5868,7 @@ msgid "Client"
 msgstr "Client"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "System"
 
@@ -6084,23 +5993,15 @@ msgstr "_Fensterverhalten"
 msgid "_Show contact list on startup"
 msgstr "Kontaktli_ste beim Start anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr "Kont_aktbild in Chat-Tabs anzeigen"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr "Falls aktiviert, wird das Kontaktbild auch im Chat-Tab angezeigt"
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr "Position der _Tableiste"
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr "_Gajim beenden, wenn die Kontaktliste geschlossen wird"
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
@@ -6108,15 +6009,23 @@ msgstr ""
 "Fall aktiviert, wird Gajim beendet statt sich in den "
 "Benachrichtigungsbereich des Systems zu minimieren"
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr "Verhalten der Fenster und Tabs"
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+msgid "Me_rge accounts"
+msgstr "Konten _zusammenführen"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr "Zeigt alle deine Konten zusammengeführt zu einem einzigen Konto"
+
+#: gajim/data/gui/preferences_window.ui:421
 msgid "Show a_vatars of contacts in contact list"
 msgstr "_Kontaktbilder in der Kontaktliste anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
 "in group chats"
@@ -6124,11 +6033,11 @@ msgstr ""
 "Falls aktiviert, werden die Kontaktbilder in der Kontaktliste und in "
 "Gruppenchats angezeigt"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 msgid "Show status _messages of contacts in contact list"
 msgstr "Statusnachrichten von Kontakten in der Kontaktliste an_zeigen"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
 "name, in the contact list window, and in group chats"
@@ -6136,14 +6045,14 @@ msgstr ""
 "Falls aktiviert, wird die Statusnachricht jedes Kontakts unter dem Namen "
 "jeden Kontaktes in der Kontaktliste und in Gruppenchats angezeigt"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 "E_xtrainformationen von Kontakten (Stimmung, Aktivität, ...) in der "
 "Kontaktliste anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
@@ -6153,27 +6062,27 @@ msgstr ""
 "in der Kontaktliste angezeigt. Zusätzliche (über PEP veröffentlichte) "
 "Informationen können z.B. Stimmung, Aktivität, Standort, usw. umfassen."
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 msgid "in _contact list"
 msgstr "in der _Kontaktliste"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "in _Gruppenchats"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 msgid "Contact List Appearance"
 msgstr "Erscheinungsbild der Kontaktliste"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr "Automatisches Kopieren aktivieren"
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
@@ -6181,11 +6090,11 @@ msgstr ""
 "Falls aktiviert, wird Text beim Markieren in die Zwischenablage kopiert. "
 "Andernfalls kann Text mit STRG + UMSCHALT + C kopiert werden."
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr "Re_chtschreibprüfung aktivieren"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6197,30 +6106,29 @@ msgstr ""
 "Rechtsklick), wird die Standardsprache für diesen Kontakt oder Gruppenchat "
 "verwendet. Benötigt gspell."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 msgid "Show message recei_pts (✔)"
 msgstr "Em_pfangsbestätigungen (✔) für Nachrichten anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 "Falls aktiviert, wird ein kleines Häkchen nach jeder Nachricht angezeigt, "
-"sobald diese vom Kontakt empfangen wurde. Beachten Sie, dass dies nicht von "
-"allen Chat-Clients unterstützt wird und daher zu falschen Annahmen führen "
-"könnte."
+"sobald diese vom Kontakt empfangen wurde. Dies wird nicht von allen Chat-"
+"Clients unterstützt und kann daher zu falschen Annahmen führen."
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 msgid "_Show XHTML formatting"
 msgstr "_XHTML-Formatierungen anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 msgid "Display status messages in _single chats"
 msgstr "_Statusnachrichten in Einzelchats anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
@@ -6228,24 +6136,24 @@ msgstr ""
 "Falls aktiviert, wird Gajim Statusnachrichten in Einzelchats anzeigen, wenn "
 "ein Kontakt den Status oder die Statusnachricht ändert"
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 msgid "Show subject after _joining a group chat"
 msgstr "_Zeige das Thema nach dem Beitreten eines Gruppenchats"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr ""
 "Falls aktiviert, wird beim Beitreten des Gruppenchats das Thema angezeigt"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 msgid "Group Chat Settings"
 msgstr "Gruppenchat-Einstellungen"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr "Beitreten/Verlassen anzeigen (Standard)"
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
@@ -6254,7 +6162,7 @@ msgstr ""
 "werden sollen. Diese Einstellung kann im Gruppenchatmenü überschrieben "
 "werden."
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
@@ -6263,15 +6171,15 @@ msgstr ""
 "öffentliche Gruppenchats. Diese Einstellung kann im Gruppenchatmenü "
 "überschrieben werden."
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr "Standardwert für Synchronisationsbegrenzung"
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 msgid "Show status changes (Default)"
 msgstr "Statusänderungen anzeigen (Standard)"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
@@ -6279,11 +6187,11 @@ msgstr ""
 "Ob Nachrichten zu Statusänderungen in Gruppenchats angezeigt werden sollen. "
 "Diese Einstellung kann im Gruppenchatmenü überschrieben werden."
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 msgid "Show chatstate in tabs"
 msgstr "Chatstatus in Tabs anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
@@ -6291,11 +6199,11 @@ msgstr ""
 "Falls aktiviert, wird der Tab entsprechend dem aktuellen Chatstatus des "
 "Kontakts gefärbt"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 msgid "Show chatstate in contact list"
 msgstr "Chatstatus in Kontaktliste anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
@@ -6303,52 +6211,52 @@ msgstr ""
 "Falls aktiviert, wird die Kontakt-Ebene dem Chatstatus des Kontakts "
 "entsprechend gefärbt"
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr "Zeige Chatstatus im Banner"
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
-"Falls aktiviert, wird eine Beschreibung des aktuellen Chatstatus des "
-"Kontakts im Banner angezeigt"
+"Falls aktiviert, wird der aktuelle Chatstatus des Kontakts im Banner "
+"angezeigt"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 msgid "Chatstate"
 msgstr "Chatstatus"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Chat"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 msgid "Show _notification area icon"
 msgstr "Be_nachrichtigungssymbol anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 msgid "_When new event is received"
 msgstr "_Wenn ein neues Ereignis empfangen wurde"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "_Benachrichtigungen auch dann anzeigen, wenn bereits ein Chatfenster "
 "geöffnet ist"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Benachrichtigungen auch dann anzeigen, wenn ich _Abwesend, Nicht Verfügbar "
 "oder Beschäftigt bin"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Benachr_ichtigung anzeigen, wenn sich ein Kontakt anmeldet"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
@@ -6356,11 +6264,11 @@ msgstr ""
 "Eine Benachrichtigung wird in der unteren rechten Ecke des Bildschirms "
 "angezeigt, sobald ein Kontakt sich anmeldet "
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Benachrichtigung anzeigen, wenn sich ein K_ontakt abmeldet"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
@@ -6368,36 +6276,36 @@ msgstr ""
 "Eine Benachrichtigung wird in der unteren rechten Ecke des Bildschirms "
 "angezeigt, sobald ein Kontakt sich abmeldet "
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Visuelle Benachrichtigungen"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Klänge ab_spielen"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Verwalte_n..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Die Wiedergabe von Klängen erlauben, wenn ich _Beschäftigt bin"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 msgid "Sounds"
 msgstr "Klänge"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 msgid "No_t Available"
 msgstr "Nich_t Verfügbar"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
@@ -6405,7 +6313,7 @@ msgstr ""
 "Falls aktiviert, wird der Status in Nicht Verfügbar geändert, wenn der "
 "Computer für die angegebene Zeit nicht genutzt wurde"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
@@ -6413,7 +6321,7 @@ msgstr ""
 "Falls aktiviert, wird der Status in Beschäftigt geändert, wenn der Computer "
 "für die angegebene Zeit nicht genutzt wurde"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6426,7 +6334,7 @@ msgstr ""
 "$T ist ein Platzhalter für die Zeit, nach der der Status automatisch auf "
 "Abwesend gesetzt wird."
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6440,19 +6348,19 @@ msgstr ""
 "$T ist ein Platzhalter für die Zeit, nach der der Status automatisch auf "
 "Nicht Verfügbar gesetzt wird."
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 msgid "Minutes"
 msgstr "Minuten"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 msgid "Automatic Status"
 msgstr "Automatischer Status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr "Status der letzten Sitzung merken und wiede_rherstellen"
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
@@ -6460,82 +6368,82 @@ msgstr ""
 "Falls aktiviert, werden der Status und die Statusnachricht der letzten "
 "Sitzung wiederhergestellt"
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 msgid "Ask for status message when I"
 msgstr "Frage nach einer Statusnachricht, wenn ich mich"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Anmelde"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "A_bmelde"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
-"Falls aktiviert, werden Sie nicht nach einer Statusnachricht gefragt. Die "
+"Falls aktiviert, wirst du nicht nach einer Statusnachricht gefragt. Die "
 "Standard-Statusnachricht wird benutzt."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Standard-Statusnachricht"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 msgid "Status Messages"
 msgstr "Statusnachrichten"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Voreingestellte Statusnachrichten"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 msgid "Themes"
 msgstr "Designs"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 msgid "_Theme"
 msgstr "Desi_gn"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Farben und Schriftarten der Oberfläche konfigurieren"
 
 # TODO mark as do not translate?
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 msgid "_Dark Theme"
 msgstr "_Dunkles Design"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr "Emojis"
 
 # TODO mark as do not translate?
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 msgid "_Emoji Theme"
 msgstr "_Emoji-Design"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr "Icons"
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 msgid "_Status iconset"
 msgstr "_Status-Iconset"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 msgid "Use transports _icons"
 msgstr "Transport-_Icons verwenden"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
 "ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)"
@@ -6544,64 +6452,64 @@ msgstr ""
 "einem ICQ Kontakt werden die ICQ Statusicons für \"Anwesend\", \"Abwesend\", "
 "\"Beschäftigt\", etc. angezeigt.)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr "AS_CII-Emojis konvertieren"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Design"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 msgid "Show _Features"
 msgstr "_Features anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr "A_udioausgabegerät"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr "_Audioaufnahmegerät"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr "Audio"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr "Video"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 msgid "_Video input device"
 msgstr "_Videoaufnahmegeräte"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 msgid "Video output"
 msgstr "Video-Ausgabegerät"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr "Bild_wiederholrate"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr "Video_größe"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr "_Eigene Videoquelle anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Verbindung"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 msgid "STU_N server"
 msgstr "STU_N-Server"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
@@ -6609,49 +6517,61 @@ msgstr ""
 "STUN-Server Hostname. Falls nicht definiert, wird\n"
 "Gajim versuchen, einen vom Server zu ermitteln. (Beispiel: stun.iptel.org)"
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr "Audio/Video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr "_Globaler Proxy"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Verwalten..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 msgid "_Store status changes of contacts in history"
 msgstr "_Speichere die Statusänderungen von Kontakten im Unterhaltungsverlauf"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr "_Debug logging für die Fehlerbehebung aktivieren (benötigt Neustart)"
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr ""
 "Falls aktiviert, wird Gajim eine Log-Datei zum Debuggen (Fehlerbehebung) "
 "speichern"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr "Öffnet den Ordner der debug logs"
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr "Hinweise zu_rücksetzen"
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+"Um dir neue Funktionen vorzustellen zeigt Gajim einige Hinweise. Dieser "
+"Button wird die Hinweise zurücksetzen."
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
-msgstr "Achtung: Bitte nutzen Sie diese Einstellungen mit Vorsicht!"
+msgstr "Achtung: Bitte nutze diese Einstellungen mit Vorsicht!"
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "Ö_ffnen..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Erweiterter Konfigurationseditor (ACE)"
 
@@ -6675,7 +6595,7 @@ msgstr ""
 #: gajim/data/gui/groupchat_config.ui:156
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
-"Nur Administratoren und Besitzer können die Gruppenzugehörigkeit ändern"
+"Nur Administratoren und Eigentümer können die Gruppenzugehörigkeit ändern"
 
 #: gajim/data/gui/groupchat_config.ui:270
 #: gajim/data/gui/groupchat_info_scrolled.ui:179 gajim/plugins/gui.py:317
@@ -6802,11 +6722,11 @@ msgstr "Willkommen"
 
 #: gajim/data/gui/account_wizard.ui:219
 msgid "Please enter your credentials or Sign Up"
-msgstr "Bitte geben Sie Ihre Zugangsdaten ein oder registrieren Sie sich"
+msgstr "Bitte gib deine Zugangsdaten ein oder registriere dich"
 
 #: gajim/data/gui/account_wizard.ui:237
 msgid "Your XMPP address (e.g. user@example.org)"
-msgstr "Ihre XMPP-Adresse (z.B. benutzer@beispiel.org)"
+msgstr "Deine XMPP-Adresse (z.B. benutzer@beispiel.org)"
 
 #: gajim/data/gui/account_wizard.ui:239
 #: gajim/data/gui/single_message_window.ui:59
@@ -6815,13 +6735,13 @@ msgstr "benutzer@beispiel.org"
 
 #: gajim/data/gui/account_wizard.ui:252
 msgid "Your password"
-msgstr "Ihr Passwort"
+msgstr "Dein Passwort"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 msgid "_Advanced Settings"
 msgstr "_Erweiterte Einstellungen"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 msgid "Proxy, custom hostname and port"
 msgstr "Proxy, benutzerdefinierter Hostname und Port"
 
@@ -6831,7 +6751,7 @@ msgstr "_Einloggen"
 
 #: gajim/data/gui/account_wizard.ui:288
 msgid "Log in with your credentials"
-msgstr "Mit Ihren Zugangsdaten einloggen"
+msgstr "Mit deinen Zugangsdaten einloggen"
 
 #: gajim/data/gui/account_wizard.ui:304
 msgid "or"
@@ -6843,7 +6763,7 @@ msgstr "_Registrieren"
 
 #: gajim/data/gui/account_wizard.ui:318
 msgid "Sign up for a new account on a server of your choice"
-msgstr "Ein neues Konto bei einem Server Ihrer Wahl registrieren"
+msgstr "Ein neues Konto bei einem Server deiner Wahl registrieren"
 
 #: gajim/data/gui/account_wizard.ui:369
 msgid "Visit Website"
@@ -6880,7 +6800,7 @@ msgid ""
 "from other servers as well."
 msgstr ""
 "Es stehen reichlich Server zur Auswahl.\n"
-"Nach der Registrierung bei einem Server Ihrer Wahl können Sie problemlos mit "
+"Nach der Registrierung bei einem Server deiner Wahl kannst du problemlos mit "
 "Kontakten auf anderen Servern kommunizieren."
 
 #: gajim/data/gui/account_wizard.ui:530
@@ -6909,25 +6829,25 @@ msgstr ""
 "<a href='https://conversations.im/compliance/'>conversations.im/compliance</"
 "a>"
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 msgid "Sign Up"
 msgstr "Registrieren"
 
 #: gajim/data/gui/account_wizard.ui:646
 msgid "_Please choose a server"
-msgstr "_Bitte wählen Sie einen Server"
+msgstr "_Bitte wähle einen Server"
 
 #: gajim/data/gui/account_wizard.ui:702
 msgid "Sign up Anonymously"
 msgstr "Anonym registrieren"
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr "Hinweis: Anonyme Konten sind nicht auf allen Servern möglich"
 
 #: gajim/data/gui/advanced_configuration.ui:39
 msgid "You should restart Gajim for some changes to take effect"
-msgstr "Sie sollten Gajim neustarten, damit alle Änderungen in Kraft treten"
+msgstr "Du solltest Gajim neustarten, damit alle Änderungen in Kraft treten"
 
 #: gajim/data/gui/advanced_configuration.ui:71
 msgid "_Filter"
@@ -6945,8 +6865,8 @@ msgstr "_Zurücksetzen"
 msgid "Resets value to default"
 msgstr "Setzt die Einstellung auf den Standardwert zurück"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -6982,7 +6902,7 @@ msgstr "Zertifikat _anzeigen"
 msgid "Proxy Host"
 msgstr "Proxy-Host"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Typ"
 
@@ -6994,8 +6914,7 @@ msgstr "Protokoll"
 msgid "Copy info to clipboard"
 msgstr "Infos in die Zwischenablage kopieren"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Features"
 
@@ -7018,7 +6937,7 @@ msgstr "Synchronisieren: Kontakte auswählen"
 
 #: gajim/data/gui/synchronise_select_contacts_dialog.ui:67
 msgid "Select the contacts you want to synchronise"
-msgstr "Kontakte auswählen, die Sie synchronisieren möchten"
+msgstr "Kontakte auswählen, die du synchronisieren möchtest"
 
 #: gajim/data/gui/ssl_error_dialog.ui:16 gajim/gtk/ssl_error_dialog.py:36
 msgid "SSL Certificate Verification Error"
@@ -7054,7 +6973,7 @@ msgstr "Nachricht..."
 
 #: gajim/data/gui/groupchat_invitation_received.ui:120
 msgid "_Message if you decline (optional)"
-msgstr "Begründung, falls Sie ablehnen (_optional)"
+msgstr "Begründung, falls du ablehnst (_optional)"
 
 #: gajim/data/gui/edit_groups_dialog.ui:8
 msgid "Edit Groups"
@@ -7078,7 +6997,7 @@ msgstr "La_une"
 
 #: gajim/data/gui/change_status_message_dialog.ui:314
 msgid "_Type your new status message"
-msgstr "_Geben Sie Ihre neue Statusnachricht ein"
+msgstr "_Gib eine neue Statusnachricht ein"
 
 #: gajim/data/gui/synchronise_select_account_dialog.ui:8
 msgid "Synchronise contacts"
@@ -7086,7 +7005,7 @@ msgstr "Kontakte synchronisieren"
 
 #: gajim/data/gui/synchronise_select_account_dialog.ui:68
 msgid "Select the account with which you want to synchronise"
-msgstr "Das Konto auswählen, mit dem Sie sich synchronisieren möchten"
+msgstr "Das Konto auswählen, mit dem du dich synchronisieren möchtest"
 
 #: gajim/data/gui/voip_call_received_dialog.ui:15
 msgid "<b><big>Incoming call</big></b>"
@@ -7106,7 +7025,7 @@ msgstr "_Gruppe"
 
 #: gajim/data/gui/add_new_contact_window.ui:165
 msgid "Choose or type new group name"
-msgstr "Wählen Sie eine Gruppe oder geben Sie einen neuen Namen ein"
+msgstr "Wähle eine Gruppe oder gib einen neuen Namen ein"
 
 #: gajim/data/gui/add_new_contact_window.ui:181
 msgid "A_ccount"
@@ -7136,10 +7055,10 @@ msgid ""
 "protocol. Click on Register button to\n"
 "proceed."
 msgstr ""
-"Sie müssen sich bei diesem Transport\n"
+"Du musst dich bei diesem Transport\n"
 "registrieren, um einen Kontakt über dieses\n"
-"Protokoll hinzufügen zu können. Klicken\n"
-"Sie auf Registrieren, um fortzufahren."
+"Protokoll hinzufügen zu können. Klicke\n"
+"auf Registrieren, um fortzufahren."
 
 #: gajim/data/gui/add_new_contact_window.ui:406
 msgid "_Register"
@@ -7150,13 +7069,18 @@ msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 msgstr ""
-"Sie müssen mit dem Transport verbunden sein, um einen\n"
+"Du musst mit dem Transport verbunden sein, um einen\n"
 "Kontakt über dieses Protokoll hinzufügen zu können."
 
 #: gajim/data/gui/roster_window.ui:55
 msgid "Change Status Message…"
 msgstr "Statusnachricht ändern…"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Stimmung:</b>"
@@ -7167,7 +7091,7 @@ msgstr "<b>Nachricht:</b>"
 
 #: gajim/data/gui/themes_window.ui:43
 msgid "Add a setting you would like to change"
-msgstr "Fügen Sie eine Einstellung hinzu, die Sie ändern möchten."
+msgstr "Füge eine Einstellung hinzu, die du ändern möchtest."
 
 #: gajim/data/gui/themes_window.ui:171
 msgid "Add Setting"
@@ -7225,8 +7149,8 @@ msgstr "Installiert"
 # TODO unify speliing of plug-in, plugin
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "Plugin Beschreibung. Dieser Text wird bei der Initialisierung des Plugin-"
 "Fensters gelöscht."
@@ -7305,7 +7229,7 @@ msgstr "meinen Status zu sehen"
 
 #: gajim/data/gui/privacy_list_window.ui:541
 msgid "to send me status"
-msgstr "mir seinen/ihren Status zu senden"
+msgstr "mir den Status zu senden"
 
 #: gajim/data/gui/privacy_list_window.ui:557
 msgid "All (including subscription)"
@@ -7402,68 +7326,86 @@ msgstr "Einstellungen"
 msgid "_Name"
 msgstr "_Name"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 msgid "Proxy"
 msgstr "Proxy"
 
+#: gajim/data/gui/application_menu.ui:8
+msgid "_Start / Join Chat…"
+msgstr "Chat _starten / beitreten…"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
-msgid "Create Group Chat"
-msgstr "Gruppenchat erstellen"
+msgid "Create _Group Chat…"
+msgstr "Gruppenchat _erstellen…"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+msgid "_History Manager"
+msgstr "Unter_haltungsverläufe verwalten"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
-msgstr "Einstellungen"
+#: gajim/data/gui/application_menu.ui:22
+msgid "Pl_ugins"
+msgstr "Pl_ugins"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+msgid "_Preferences"
+msgstr "_Einstellungen"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "Beenden"
+#: gajim/data/gui/application_menu.ui:36
+msgid "_Accounts"
+msgstr "Kont_en"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
-msgstr "Ansicht"
+msgid "_View"
+msgstr "Ansi_cht"
 
-#: gajim/data/gui/application_menu.ui:42
-msgid "Show Contact List"
-msgstr "Kontaktliste anzeigen"
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
+msgid "Show _Contact List"
+msgstr "Kontaktliste _anzeigen"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
-msgstr "Abgemeldete Kontakte anzeigen"
+msgid "Show _Offline Contacts"
+msgstr "Abgemeldete K_ontakte anzeigen"
 
 #: gajim/data/gui/application_menu.ui:50
-msgid "Show Active Contacts"
-msgstr "Nur aktive Kontakte anzeigen"
+msgid "Show _Active Contacts"
+msgstr "Nur _aktive Kontakte anzeigen"
 
 #: gajim/data/gui/application_menu.ui:54
-msgid "Show Transports"
-msgstr "Transporte anzeigen"
+msgid "Show _Transports"
+msgstr "_Transporte anzeigen"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
-msgstr "XML-Konsole"
+#: gajim/data/gui/application_menu.ui:60
+msgid "_XML Console"
+msgstr "_XML-Konsole"
+
+#: gajim/data/gui/application_menu.ui:64
+msgid "_File Transfer"
+msgstr "Date_iübertragung"
 
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
-msgstr "Hilfe"
+msgid "_Help"
+msgstr "_Hilfe"
 
 #: gajim/data/gui/application_menu.ui:77
-msgid "Wiki (Online)"
-msgstr "Wiki (online)"
+msgid "_Wiki (Online)"
+msgstr "_Wiki (online)"
 
 #: gajim/data/gui/application_menu.ui:81
-msgid "FAQ (Online)"
-msgstr "FAQ (online)"
+msgid "FA_Q (Online)"
+msgstr "FA_Q (online)"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
-msgstr "Tastenkürzel"
+msgid "_Keyboard Shortcuts"
+msgstr "Tasten_kürzel"
+
+#: gajim/data/gui/application_menu.ui:89
+msgid "_Features"
+msgstr "_Features"
+
+#: gajim/data/gui/application_menu.ui:93
+msgid "_About"
+msgstr "Übe_r"
 
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
@@ -7474,14 +7416,18 @@ msgid ""
 "<b>Private:</b> If you plan to chat encrypted, you would typically want to "
 "create a private group chat. You have to invite people so they can join."
 msgstr ""
-"<b>Privat:</b> Wenn Sie verschlüsselt schreiben wollen, dann benötigen Sie "
-"typischerweise einen privaten Gruppenchat. Sie müssen Kontakte einladen, "
-"damit sie beitreten können."
+"<b>Privat:</b> Wenn du verschlüsselt schreiben willst, dann benötigst du "
+"typischerweise einen privaten Gruppenchat. Du musst Kontakte einladen, damit "
+"sie beitreten können."
 
 #: gajim/data/gui/groupchat_creation.ui:58
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr "<b>Öffentlich:</b> Jeder, der die Adresse kennt, kann beitreten."
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+msgid "Create Group Chat"
+msgstr "Gruppenchat erstellen"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 msgid "_Description"
 msgstr "_Beschreibung"
@@ -7505,8 +7451,8 @@ msgid ""
 msgstr ""
 "Gajim hat einen Fehler festgestellt. Der Fehlerbericht wird unten "
 "angezeigt.\n"
-"Sie können den Entwicklern helfen das Problem zu beheben, indem Sie den "
-"Fehler melden."
+"Du kannst den Entwicklern helfen das Problem zu beheben, indem du den Fehler "
+"meldest."
 
 #: gajim/data/gui/exception_dialog.ui:116
 msgid "_Report Bug"
@@ -7521,8 +7467,8 @@ msgid ""
 "Deny authorization from contact so the contact cannot know if you are "
 "connected"
 msgstr ""
-"Dem Kontakt die Autorisierung verweigern, sodass er Ihren Status nicht sehen "
-"kann"
+"Dem Kontakt die Autorisierung verweigern, sodass er deinen Status nicht "
+"sehen kann"
 
 #: gajim/data/gui/subscription_request_window.ui:165
 msgid "Ac_cept"
@@ -7530,7 +7476,7 @@ msgstr "An_nehmen"
 
 #: gajim/data/gui/subscription_request_window.ui:171
 msgid "Authorize contact so the contact can know if you are connected"
-msgstr "Kontakt autorisieren, sodass er Ihren Status sehen kann"
+msgstr "Kontakt autorisieren, sodass er deinen Status sehen kann"
 
 #: gajim/data/gui/groupchat_info_scrolled.ui:17
 msgid "Address"
@@ -7565,12 +7511,12 @@ msgid ""
 "You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
-"Sie treten nun einem Gruppenchat bei.\n"
-"Wählen Sie die Kontakte, die Sie einladen wollen"
+"Du trittst nun einem Gruppenchat bei.\n"
+"Wähle die Kontakte, die du einladen willst"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a group chat server."
-msgstr "Bitte wählen Sie einen Gruppenchat-Server aus."
+msgstr "Bitte wähle einen Gruppenchat-Server aus."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "Group chat server"
@@ -7609,11 +7555,10 @@ msgid ""
 "from the left or search the database."
 msgstr ""
 "Dieses Verwaltungswerkzeug ist nicht zum Ansehen der Unterhaltungsverläufe "
-"gedacht. Wenn Sie nach einer solchen Funktion suchen, benutzen Sie bitte "
-"stattdessen das Fenster für Unterhaltungsverläufe.\n"
+"gedacht. Benutze dafür bitte das Fenster für Unterhaltungsverläufe.\n"
 "\n"
-"Benutzen Sie dieses Werkzeug, um Unterhaltungsverläufe zu löschen oder zu "
-"exportieren. Sie können links Einträge auswählen oder unten die Datenbank "
+"Du kannst dieses Werkzeug benutzen, um Unterhaltungsverläufe zu löschen oder "
+"zu exportieren. Du kannst links Einträge auswählen oder unten die Datenbank "
 "durchsuchen."
 
 #: gajim/data/gui/history_manager.ui:124
@@ -7623,9 +7568,9 @@ msgid ""
 "Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>WARNUNG:</b>\n"
-"Wenn Sie viele Einträge löschen möchten, beenden Sie Gajim bitte vorher. "
-"Vermeiden Sie generell das Löschen von Unterhaltungen mit Kontakten denen "
-"Sie gerade Nachrichten schreiben."
+"Wenn du viele Einträge löschen möchtest, beende Gajim bitte vorher. Vermeide "
+"generell das Löschen von Unterhaltungen mit Kontakten denen du gerade "
+"schreibst."
 
 #: gajim/data/gui/history_manager.ui:217
 msgid "Search database..."
@@ -7641,7 +7586,7 @@ msgstr "Tastenkürzel für den Chat"
 
 #: gajim/data/gui/shortcuts_window.ui:12
 msgid "Message composition"
-msgstr "Nachrichtenerstellung"
+msgstr "Verfassen"
 
 #: gajim/data/gui/shortcuts_window.ui:17
 msgid "Send the message"
@@ -7743,51 +7688,59 @@ msgstr "Tastenkürzel für die Kontaktliste"
 msgid "Create new group chat"
 msgstr "Neuen Gruppenchat erstellen"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Plugins"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 msgid "File transfers"
 msgstr "Dateiübertragungen"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr "Statusnachricht festlegen"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 msgid "Show XML console"
 msgstr "XML-Konsole anzeigen"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Erscheinungsbild der Kontaktliste"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Abgemeldete Kontakte anzeigen"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 msgid "Show only active contacts"
 msgstr "Nur aktive Kontakte anzeigen"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr "Aktiviere Filterung in der Kontaktliste"
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 msgid "Show / hide contact list"
 msgstr "Kontaktliste zeigen / verbergen"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr "Kontakt umbenennen"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "Kontakt löschen"
 
@@ -7825,7 +7778,7 @@ msgid ""
 "You can also type an XMPP address."
 msgstr ""
 "Keine Kontakte übrig.\n"
-"Sie können auch eine XMPP-Adresse eingeben."
+"Du kannst auch eine XMPP-Adresse eingeben."
 
 #: gajim/data/gui/groupchat_invite.ui:69
 msgid "Invitees"
@@ -7837,8 +7790,7 @@ msgstr "Kontakte suchen..."
 
 #: gajim/data/gui/groupchat_invite.ui:223
 msgid "Click on contacts you would like to invite to this group chat."
-msgstr ""
-"Klicken Sie auf Kontakte, die Sie in diesen Gruppenchat einladen wollen."
+msgstr "Klicke auf Kontakte, die du in diesen Gruppenchat einladen willst."
 
 #: gajim/data/gui/manage_pep_services_window.ui:46
 msgid "Configure"
@@ -7850,17 +7802,21 @@ msgstr "Neuen Beitrag erstellen"
 
 #: gajim/data/gui/data_form_window.ui:19
 msgid "Fill in the form."
-msgstr "Bitte füllen Sie das Formular aus."
+msgstr "Bitte fülle das Formular aus."
 
 #: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:40
 msgid "Group Chat Configuration"
 msgstr "Gruppenchat-Konfiguration"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML-Konsole"
+
 #: gajim/data/gui/xml_console.ui:131
 msgid "Start Search..."
 msgstr "Suche starten…"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "Filter"
 
@@ -7901,10 +7857,6 @@ msgstr "Zeige alle neuen _Ereignisse"
 msgid "Mute Sounds"
 msgstr "Klänge stummschalten"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-msgid "_Preferences"
-msgstr "_Einstellungen"
-
 #: gajim/data/gui/single_message_window.ui:42
 msgid "_To"
 msgstr "_An"
@@ -8226,43 +8178,43 @@ msgstr "%(progress)s von %(total)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr "%(minutes)s min %(seconds)s sek"
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 msgid "?Group chat feature:Open"
 msgstr "Offen"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
 msgstr "Jeder kann dem Gruppenchat beitreten"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 msgid "?Group chat feature:Members Only"
 msgstr "Nur für Mitglieder"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr "Gruppenchat ist nur für Mitglieder"
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Nicht anonym"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
-msgstr "Alle Teilnehmer des Gruppenchats können Ihre XMPP-Adresse sehen"
+msgstr "Alle Teilnehmer des Gruppenchats können deine XMPP-Adresse sehen"
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Halbanonym"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
-msgstr "Nur Moderatoren können Ihre XMPP-Adresse sehen"
+msgstr "Nur Moderatoren können deine XMPP-Adresse sehen"
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 msgid "?Group chat feature:Moderated"
 msgstr "Moderiert"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
@@ -8270,70 +8222,70 @@ msgstr ""
 "Teilnehmer, die diesem Gruppenchat beitreten müssen zunächst nach der "
 "Berechtigung fragen, ehe sie Nachrichten schreiben können"
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 msgid "?Group chat feature:Not Moderated"
 msgstr "Unmoderiert"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 "Teilnehmer, die diesem Gruppenchat beitreten dürfen Nachrichten schreiben"
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 msgid "?Group chat feature:Public"
 msgstr "Öffentlich"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr "Gruppenchat kann mithilfe einer Suche gefunden werden"
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 msgid "?Group chat feature:Hidden"
 msgstr "Versteckt"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 msgid "This group chat can not be found via search"
 msgstr "Gruppenchat kann nicht durch eine Suche gefunden werden"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 msgid "?Group chat feature:Password Required"
 msgstr "Passwort benötigt"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr "Ein Passwort wird benötigt, um beizutreten"
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 msgid "?Group chat feature:No Password Required"
 msgstr "Kein Passwort benötigt"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr "Kein Passwort wird benötigt, um beizutreten"
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 msgid "?Group chat feature:Persistent"
 msgstr "Beständig"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 "Gruppenchat bleibt bestehen, auch wenn keine Teilnehmer beigetreten sind"
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 msgid "?Group chat feature:Temporary"
 msgstr "Vorübergehend"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 "Gruppenchat wird aufgelöst, sobald der letzte Teilnehmer ihn verlassen hat"
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 msgid "?Group chat feature:Archiving"
 msgstr "Nachrichtenspeicherung"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 msgid "Messages are archived on the server"
 msgstr "Nachrichten werden auf dem Server gespeichert"
 
@@ -8361,7 +8313,7 @@ msgid "Sender: %s"
 msgstr "Absender: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Empfänger: "
 
@@ -8402,7 +8354,7 @@ msgid ""
 msgstr ""
 "Die Datei %s wurde empfangen, anscheinend wurde sie jedoch bei der "
 "Übertragung beschädigt.\n"
-"Wollen Sie die Datei erneut herunterladen?"
+"Willst du die Datei erneut herunterladen?"
 
 #: gajim/gtk/filetransfer.py:341
 msgid "_Download Again"
@@ -8426,7 +8378,7 @@ msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
-"Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die "
+"Eine Datei mit diesem Namen existiert bereits und du hast nicht die "
 "erforderlichen Berechtigungen, um sie zu überschreiben."
 
 #: gajim/gtk/filetransfer.py:424
@@ -8457,7 +8409,7 @@ msgstr "Kein Schreibzugriff auf Verzeichnis \"%s\""
 #: gajim/gtk/filetransfer.py:444
 msgid "You do not have permissions to create files in this directory."
 msgstr ""
-"Sie verfügen nicht über die nötigen Benutzerrechte, um in diesem Verzeichnis "
+"Du verfügst nicht über die nötigen Benutzerrechte, um in diesem Verzeichnis "
 "Dateien zu erstellen."
 
 #: gajim/gtk/filetransfer.py:467
@@ -8510,7 +8462,7 @@ msgstr "Datei: "
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Absender: "
 
@@ -8523,7 +8475,7 @@ msgid "Change"
 msgstr "Ändern"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 msgid "Back"
 msgstr "Zurück"
 
@@ -8541,24 +8493,24 @@ msgstr "Passwort geändert"
 
 #: gajim/gtk/change_password.py:57
 msgid "Your password has successfully been changed."
-msgstr "Ihr Passwort wurde erfolgreich geändert."
+msgstr "Dein Passwort wurde erfolgreich geändert."
 
 #: gajim/gtk/change_password.py:60 gajim/gtk/change_password.py:61
 msgid "Password Change Failed"
 msgstr "Passwortänderung fehlgeschlagen"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
+msgid "An error occurred while trying to change your password."
 msgstr "Bei dem Versuch Ihr Passwort zu ändern ist ein Fehler aufgetreten."
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Passwort ändern"
 
 #: gajim/gtk/change_password.py:151
 msgid "Please enter your new password."
-msgstr "Bitte geben Sie ihr neues Passwort ein."
+msgstr "Bitte gib ein neues Passwort ein."
 
 #: gajim/gtk/change_password.py:164
 msgid "Enter new password..."
@@ -8578,7 +8530,7 @@ msgid ""
 "There was an error while attempting to verify the SSL certificate of your "
 "XMPP server (%s)."
 msgstr ""
-"Bei der Überprüfung des SSL-Zertifikats Ihres XMPP-Servers (%s) ist ein "
+"Bei der Überprüfung des SSL-Zertifikats deines XMPP-Servers (%s) ist ein "
 "Fehler aufgetreten."
 
 #: gajim/gtk/ssl_error_dialog.py:57
@@ -8586,23 +8538,19 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Unbekannter SSL-Fehler \"%s\""
 
-#: gajim/gtk/start_chat.py:54
-msgid "Start New Conversation"
-msgstr "Chat starten"
+#: gajim/gtk/start_chat.py:55
+msgid "Start / Join Chat"
+msgstr "Chat starten / beitreten"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
-msgstr "Sie können einem Gruppenchat erst beitreten, wenn Sie verbunden sind."
+msgstr "Du kannst einem Gruppenchat erst beitreten, wenn du verbunden bist."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Gruppenchat beitreten"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-msgid "Add Contact"
-msgstr "Kontakt hinzufügen"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
@@ -8610,17 +8558,17 @@ msgstr ""
 "Weltweite Suche nach Gruppenchats\n"
 "(zum Starten der Suche Enter drücken)"
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, python-format
 msgid "%s group chats found"
 msgstr "%s Gruppenchats gefunden"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 "Dieser Dienst hat noch nicht mit detaillierten Informationen geantwortet"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
@@ -8628,162 +8576,161 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten.\n"
 "Er ist wahrscheinlich veraltet oder kaputt"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Andere"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 msgid "Group Chat"
 msgstr "Gruppenchats"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
-msgstr "Sie müssen angemeldet sein, um die Dienste durchsuchen zu können"
+msgstr "Du musst angemeldet sein, um die Dienste durchsuchen zu können"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste des Kontos %s durchsuchen"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr ""
-"Es existiert kein Dienst an der Adresse, die Sie angegeben haben oder der "
-"Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
-"erneut."
+"Es existiert kein Dienst an der Adresse, die du angegeben hast oder der "
+"Dienst antwortet nicht. Überprüfe die Adresse und versuche es erneut."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 "Diese Art von Dienst enthält keine Objekte, die durchsucht werden können."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine durchsuchbaren Objekte."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 msgid "_Command"
 msgstr "_Befehl"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Suche"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "Änd_ern"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Durchsuche %(current)d / %(total)d ..."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Benutzer"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Node"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 msgid "_New post"
 msgstr "_Neuer Beitrag"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 msgid "(No subject)"
 msgstr "(Kein Betreff)"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr "Zeichen: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
-msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
+msgstr "Vergewissere dich, dass du mit \"%s\" verbunden bist."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
@@ -8791,12 +8738,12 @@ msgstr ""
 "Es ist nicht möglich, eine Nachricht an %s zu senden, die XMPP-Adresse ist "
 "ungültig."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
@@ -8841,30 +8788,11 @@ msgstr "Registrierung erfolgreich"
 msgid "Registration failed"
 msgstr "Registrierung ist fehlgeschlagen"
 
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Kein Wörterbuch für die Sprache \"%s\" verfügbar"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Sie müssen das Wörterbuch \"%s\" installieren oder eine andere Sprache "
-"wählen (durch die Einstellung \"speller_language\"), um die "
-"Rechtschreibprüfung nutzen zu können.\n"
-"\n"
-"Die Hervorhebung falsch geschriebener Wörter wird nicht funktionieren"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, python-format
 msgid ""
 "Certificate for \n"
@@ -8873,62 +8801,62 @@ msgstr ""
 "Zertifikat für \n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr "Ausgestellt für\n"
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr "Allgemeiner Name (CN): "
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr "Organisation (O): "
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr "Organizationseinheit (OU): "
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
 msgstr "Seriennummer: "
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr "Ausgestellt von\n"
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr "Gültigkeit\n"
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr "Ausgestellt am: "
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr "Läuft ab am: "
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr "SHA-1:"
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr "SHA-256:"
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 msgid "Group Chat Invitation "
 msgstr "Gruppenchat-Einladung "
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
-"<b>%(contact)s</b> hat Sie zum Gruppenchat <b>%(room_jid)s</b> eingeladen"
+"<b>%(contact)s</b> hat dich zum Gruppenchat <b>%(room_jid)s</b> eingeladen"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -8941,6 +8869,10 @@ msgstr "GG-Nummer"
 msgid "ICQ Number"
 msgstr "ICQ-Nummer"
 
+#: gajim/gtk/add_contact.py:42
+msgid "Add Contact"
+msgstr "Kontakt hinzufügen"
+
 #: gajim/gtk/add_contact.py:260
 #, python-format
 msgid "%s Missing"
@@ -8962,7 +8894,7 @@ msgstr "Die Benutzer-ID darf keine XMPP-Ressource enthalten."
 
 #: gajim/gtk/add_contact.py:300
 msgid "You cannot add yourself to your contact list."
-msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
+msgstr "Du kannst dich nicht selbst zu deiner Kontaktliste hinzuzufügen."
 
 #: gajim/gtk/add_contact.py:305
 msgid "Account Offline"
@@ -8970,7 +8902,7 @@ msgstr "Konto abgemeldet"
 
 #: gajim/gtk/add_contact.py:306
 msgid "Your account must be online to add new contacts."
-msgstr "Ihr Konto muss online sein, um neue Kontakte hinzufügen zu können."
+msgstr "Dein Konto muss online sein, um neue Kontakte hinzufügen zu können."
 
 #: gajim/gtk/add_contact.py:322
 msgid "Contact Already in Contact List"
@@ -8978,7 +8910,7 @@ msgstr "Kontakt ist bereits in der Kontaktliste"
 
 #: gajim/gtk/add_contact.py:323
 msgid "This contact is already in your contact list."
-msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
+msgstr "Der angegebene Kontakt befindet sich bereits in deiner Kontaktliste."
 
 #: gajim/gtk/add_contact.py:380 gajim/gtk/add_contact.py:418
 msgid "User ID:"
@@ -8991,12 +8923,12 @@ msgstr "Fehler beim Hinzufügen des Transport-Dienstes"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
-"Folgender Fehler trat auf beim Hinzufügen eines Kontaktes zum Transport "
-"%(transport)s:\n"
+"Folgender Fehler trat beim Hinzufügen eines Kontaktes zum Transport "
+"%(transport)s auf:\n"
 "\n"
 "%(error)s"
 
@@ -9022,7 +8954,7 @@ msgstr "Chatstatus Pausiert"
 
 #: gajim/gtk/themes.py:53
 msgid "Group Chat Tab New Directed Message"
-msgstr "Gruppenchat-Tab Neue an Sie gerichtete Nachricht"
+msgstr "Gruppenchat-Tab Neue an dich gerichtete Nachricht"
 
 #: gajim/gtk/themes.py:57
 msgid "Group Chat Tab New Message"
@@ -9132,40 +9064,56 @@ msgstr "Hintergrundfarbe des Kontakts bei Verbindungstrennung"
 msgid "Contact Connected Background "
 msgstr "Hintergrundfarbe des Kontakts bei Verbindung "
 
+#: gajim/gtk/themes.py:164
+msgid "Status Online Color"
+msgstr "Statusfarbe Online"
+
+#: gajim/gtk/themes.py:167
+msgid "Status Away Color"
+msgstr "Statusfarbe Abwesend"
+
+#: gajim/gtk/themes.py:170
+msgid "Status DND Color"
+msgstr "Statusfarbe Nicht Stören"
+
+#: gajim/gtk/themes.py:173
+msgid "Status Offline Color"
+msgstr "Statusfarbe Offline"
+
 # TODO mark as do not translate?
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:187
 msgid "Gajim Themes"
 msgstr "Gajim Designs"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 msgid "Invalid Name"
 msgstr "Ungültiger Name"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr "Der Name <b>default</b> ist nicht erlaubt"
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 msgid "Spaces are not allowed"
 msgstr "Leerzeichen sind nicht erlaubt"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 msgid "Do you want to delete this theme?"
-msgstr "Möchten Sie dieses Design löschen?"
+msgstr "Möchtest du dieses Design löschen?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr ""
-"Dieses Design verwenden Sie gerade.\n"
-"Wollen Sie das Design löschen?"
+"Dieses Design verwendest du gerade.\n"
+"Willst du das Design löschen?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 msgid "Delete Theme"
 msgstr "Design löschen"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 msgid "Remove Setting"
 msgstr "Einstellung entfernen"
 
@@ -9188,10 +9136,9 @@ msgid "Error: %s"
 msgstr "Fehler: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Fehler"
 
@@ -9205,43 +9152,43 @@ msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status ist jetzt: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "Öffnen"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 msgid "Clear File"
 msgstr "Auswahl löschen"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
 msgstr "Proxies verwalten"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 msgid "No Proxy"
 msgstr "Kein Proxy"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 msgid "Adjust to Status"
 msgstr "An Status anpassen"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "Online"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Deaktiviert"
 
@@ -9258,8 +9205,8 @@ msgid "Account Removed"
 msgstr "Konto entfernt"
 
 #: gajim/gtk/remove_account.py:57
-msgid "Your account has has been unregistered successfully."
-msgstr "Ihr Konto wurde erfolgreich gelöscht."
+msgid "Your account has has been removed successfully."
+msgstr "Dein Konto wurde erfolgreich gelöscht."
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
 msgid "Account Removal Failed"
@@ -9271,12 +9218,12 @@ msgstr "Konto entfernen"
 
 #: gajim/gtk/remove_account.py:180
 msgid "This will remove your account from Gajim."
-msgstr "Hiermit wird Ihr Konto von Gajim entfernt."
+msgstr "Hiermit wird dein Konto von Gajim entfernt."
 
 #: gajim/gtk/remove_account.py:189
 #, python-format
 msgid "Do you want to unregister your account on <b>%s</b> as well?"
-msgstr "Soll Ihr Konto auch bei <b>%s</b> gelöscht werden?"
+msgstr "Soll dein Konto auch bei <b>%s</b> gelöscht werden?"
 
 #: gajim/gtk/remove_account.py:198
 msgid "_Unregister account from service"
@@ -9286,43 +9233,47 @@ msgstr "_Konto auch bei dem Dienst löschen"
 msgid "Account has to be connected"
 msgstr "Konto muss verbunden sein"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Unterhaltungsverlauf synchronisieren"
+
+#: gajim/gtk/history_sync.py:203
 msgid "How far back should the chat history be synchronised?"
 msgstr ""
 "Für welchen Zeitraum soll der Unterhaltungsverlauf synchronisiert werden?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "Einen Monat"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "Drei Monate"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Ein Jahr"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "Komplett"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s empfangen von %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, python-format
 msgid "Downloaded %s messages"
 msgstr "%s Nachrichten heruntergeladen"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
@@ -9331,18 +9282,18 @@ msgstr ""
 "Synchronisierung des Unterhaltungsverlaufs abgeschlossen:\n"
 "%s Nachrichten heruntergeladen."
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr "Gajim ist vollständig mit dem Nachrichtenarchiv synchronisiert."
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
-"Es findet bereits eine Synchronisation statt. Bitte versuchen sie es später "
-"noch einmal."
+"Es findet bereits eine Synchronisation statt. Bitte versuche es später noch "
+"einmal."
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 msgid "A GTK XMPP client"
 msgstr "Ein XMPP-Client in GTK"
 
@@ -9393,7 +9344,7 @@ msgstr "Danke"
 #: gajim/gtk/about.py:69
 msgid "translator-credits"
 msgstr ""
-"Daniel Brötzmann (2017-2019)\n"
+"Daniel Brötzmann\n"
 "Fridtjof Busse\n"
 "Benjamin Drung (benjamin.drung AT gmail.com)\n"
 "Fabian Fingerle (fabian AT datensalat.eu)\n"
@@ -9401,108 +9352,108 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr "Datei auswählen…"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 msgid "Choose Avatar…"
 msgstr "Kontaktbild auswählen…"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 msgid "PNG files"
 msgstr "PNG-Dateien"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 msgid "JPEG files"
 msgstr "JPEG-Dateien"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr "SVG-Dateien"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Bilder"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Archiv auswählen"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 msgid "ZIP files"
 msgstr "ZIP-Dateien"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr "Datei speichern unter…"
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dieses Gruppenchats"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Verbunden"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
 msgstr "Dateiname: "
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
 msgstr "Download"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 msgid "?Noun:Upload"
 msgstr "Upload"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 msgid "?transfer type:Type: "
 msgstr "Art: "
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 msgid "?transfer status:Transferred: "
 msgstr "Übertragen: "
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 msgid "?transfer status:Status: "
 msgstr "Status: "
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 msgid "?transfer status:Aborted"
 msgstr "Abgebrochen"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 msgid "?transfer status:Completed"
 msgstr "Abgeschlossen"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Pausiert"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 msgid "?transfer status:Stalled"
 msgstr "Pausiert"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 msgid "?transfer status:Transferring"
 msgstr "Übertragung"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 msgid "?transfer status:Not started"
 msgstr "Nicht gestartet"
 
@@ -9510,7 +9461,7 @@ msgstr "Nicht gestartet"
 msgid " (optional)..."
 msgstr " (optional)..."
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 msgid "Invalid Address"
 msgstr "Ungültige Adresse"
 
@@ -9520,7 +9471,7 @@ msgstr "Nicht verbunden"
 
 #: gajim/gtk/groupchat_creation.py:187
 msgid "You have to be connected to create a group chat."
-msgstr "Sie müssen verbunden sein, um einen Gruppenchat erstellen zu können."
+msgstr "Du musst verbunden sein, um einen Gruppenchat erstellen zu können."
 
 #: gajim/gtk/sounds.py:40
 msgid "Wav Sounds"
@@ -9562,23 +9513,23 @@ msgstr "Hervorhebung von Gruppenchat-Nachrichten"
 msgid "Group Chat Message Received"
 msgstr "Gruppenchat-Nachricht empfangen"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 msgid "Required"
 msgstr "Benötigt"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Ja"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "Nein"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr "Abschicken"
 
@@ -9595,10 +9546,6 @@ msgstr "über das Konto %s"
 msgid "Hide _Contact List"
 msgstr "_Kontaktliste ausblenden"
 
-#: gajim/gtk/statusicon.py:270
-msgid "Show _Contact List"
-msgstr "Kontaktliste _anzeigen"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
@@ -9622,7 +9569,7 @@ msgstr "Informationen empfangen"
 #: gajim/gtk/profile.py:307
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
-"Ohne verbunden zu sein können sie keine Kontaktinformationen veröffentlichen."
+"Ohne verbunden zu sein kannst du keine Kontaktinformationen veröffentlichen."
 
 #: gajim/gtk/profile.py:320
 msgid "Sending profile…"
@@ -9641,34 +9588,30 @@ msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
-"Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
-"aufgetreten, versuchen Sie es später erneut."
+"Bei der Veröffentlichung deiner persönlichen Informationen ist ein Fehler "
+"aufgetreten, versuche es später noch einmal."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Archiveinstellungen für %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 msgid "Archiving Preferences Saved"
 msgstr "Archiveinstellungen gespeichert"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 msgid "Your archiving preferences have successfully been saved."
 msgstr "Archiveinstellungen wurden gespeichert."
 
-#: gajim/gtk/mam_preferences.py:101
-msgid "No response from the Server"
-msgstr "Server liefert keine Antwort"
+#: gajim/gtk/mam_preferences.py:107
+msgid "Archiving Preferences Error"
+msgstr "Fehler beim Festlegen der Archiveinstellungen"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "Fehler festgestellt: {}"
 
-#: gajim/gtk/mam_preferences.py:105
-msgid "Archiving Preferences Error"
-msgstr "Fehler beim Festlegen der Archiveinstellungen"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktiviert"
@@ -9713,32 +9656,32 @@ msgstr "Keine Beschreibung vorhanden"
 msgid "?password:Hidden"
 msgstr "Ausgeblendet"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr "Hilfe"
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr "Sicherheit"
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr "Rückmeldungen"
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr "Abuse"
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr "Verkauf"
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s Tage, %(hours)s Stunden"
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 msgid ""
 "\n"
 "Disabled in preferences"
@@ -9746,15 +9689,15 @@ msgstr ""
 "\n"
 "In den Einstellungen deaktiviert"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Audio / Video"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Ermöglicht Gajim die Bereitstellung von Audio- und Video-Chats"
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
@@ -9762,32 +9705,32 @@ msgstr ""
 "Benötigt: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
 msgstr "Funktion unter Windows nicht verfügbar"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
-"Ermöglicht Gajim die Ermittlung der Leerlaufzeit des Computers, um Ihren "
+"Ermöglicht Gajim die Ermittlung der Leerlaufzeit des Computers, um deinen "
 "Status automatisch festlegen zu können"
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr "Benötigt: libxss"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr "Keine weiteren Anforderungen"
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf (serverloser Chat)"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
@@ -9795,20 +9738,20 @@ msgstr ""
 "Ermöglicht Gajim die automatische Erkennung anderer Chat-Clients in einem "
 "lokalen Netzwerk, um serverlos zu chatten"
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Benötigt: gir1.2-avahi-0.6"
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Benötigt: laufendes pybonjour und bonjour-SDK (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 msgid "Location detection"
 msgstr "Standortermittlung"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
@@ -9816,82 +9759,79 @@ msgstr ""
 "Ermöglicht Gajim die Ermittlung des Standorts, falls der Nutzer sich zur "
 "Veröffentlichung des Gerätestandorts entscheidet"
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 msgid "Requires: geoclue"
 msgstr "Benötigt: geoclue"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 msgid "Feature is not available under Windows"
 msgstr "Funktion unter Windows nicht verfügbar"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 msgid "Notification Sounds"
 msgstr "Benachrichtigungstöne"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 "Ermöglicht Gajim das Abspielen von Tönen für verschiedene Benachrichtigungen"
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 msgid "Requires: gsound"
 msgstr "Benötigt: gsound"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 msgid "Secure Password Storage"
 msgstr "Sichere Passwortverwaltung"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
-"Ermöglicht Gajim die sichere Speicherung Ihrer Passwörter, anstatt sie im "
+"Ermöglicht Gajim die sichere Speicherung deiner Passwörter, anstatt sie im "
 "Klartext abzulegen"
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
-"Benötigt: libsecret und einen Anbieter (z.B. GNOME Keyring oder "
-"KSecretService)"
+#: gajim/gtk/features.py:129
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Benötigt: gnome-keyring oder kwallet"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 "Die Windows Passwortverwaltung wird für die sichere Speicherung der "
 "Passwörter verwendet"
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Rechtschreibprüfung"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
-"Ermöglicht Gajim die Rechtschreibprüfung Ihrer Nachrichten während des "
+"Ermöglicht Gajim die Rechtschreibprüfung deiner Nachrichten während des "
 "Schreibens"
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr "Benötigt: Gspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr "UPnP-IGD Portweiterleitung"
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
-"Ermöglicht Gajim Anfragen bei Ihrem Router für die Weiterleitung von Ports "
+"Ermöglicht Gajim Anfragen bei deinem Router für die Weiterleitung von Ports "
 "für Dateiübertragungen zu stellen"
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Benötigt: gir1.2-gupnpigd-1.0"
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 msgid "Disabled in Preferences"
 msgstr "In den Einstellungen deaktiviert"
 
@@ -9936,21 +9876,21 @@ msgstr "Ungültiger Name für die Liste"
 #: gajim/gtk/privacy_list.py:508
 msgid "You must enter a name to create a privacy list."
 msgstr ""
-"Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
+"Du musst einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
 "können."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 msgid "Invite New Contact"
 msgstr "Neuen Kontakt einladen"
 
 #: gajim/gtk/groupchat_config.py:134
 msgid "A Group Chat needs at least one Owner"
-msgstr "Ein Gruppenchat benötigt mindestens einen Besitzer"
+msgstr "Ein Gruppenchat benötigt mindestens einen Eigentümer"
 
 #: gajim/gtk/groupchat_config.py:242
 msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
-"Sie dürfen die Gruppenzugehörigkeit von Administratoren und Besitzern nicht "
+"Du darfst die Gruppenzugehörigkeit von Administratoren und Eigentümern nicht "
 "ändern"
 
 #: gajim/gtk/groupchat_config.py:399
@@ -9965,7 +9905,7 @@ msgstr "Abschließen"
 msgid "Commands"
 msgstr "Befehle"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr "Weiter"
 
@@ -10028,111 +9968,126 @@ msgstr "Kontaktanfrage von %s"
 msgid "Loading"
 msgstr "Lade"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 msgid "Connect"
 msgstr "Verbinden"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr "Einloggen"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Während der Kontoerstellung ist ein Fehler aufgetreten"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 msgid "Creating Account..."
 msgstr "Konto wird erstellt..."
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 msgid "Trying to create account..."
 msgstr "Versuche das Konto zu erstellen..."
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 msgid "Connecting to server..."
 msgstr "Verbindung wird hergestellt..."
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr "Anonyme Anmeldung wird nicht unterstützt"
+
+#: gajim/gtk/account_wizard.py:366
+msgid "This server does not support anonymous"
+msgstr "Dieser Server unterstützt die anonyme Anmeldung nicht."
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 msgid "Signup not allowed"
 msgstr "Registrierung nicht erlaubt"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 msgid "This server does not allow signup."
 msgstr "Dieser Server erlaubt keine Registrierung."
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
-"Gajim konnte den Server nicht erreichen. Bitte stellen Sie sicher, dass die "
-"XMPP-Adresse korrekt ist."
+"Gajim konnte den Server nicht erreichen. Bitte überprüfe, ob die XMPP-"
+"Adresse korrekt ist."
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 msgid "Account is being created"
 msgstr "Konto wird erstellt"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+"Der Server hat den Registrierungsversuch ohne die Angabe eines Grundes "
+"verweigert."
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 msgid "Create New Account"
 msgstr "Neues Konto registrieren"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 msgid "Must be a port number"
 msgstr "Muss eine gültige Portnummer sein"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr "Port muss eine Nummer zwischen 0 und 65535 sein"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 msgid "Advanced settings"
 msgstr "Erweiterte Einstellungen"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 msgid "Security Warning"
 msgstr "Sicherheitswarnung"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Unbekannter TLS-Fehler \"%s\""
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 msgid "Create Account"
 msgstr "Konto erstellen"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr "Umleitung"
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 msgid "Register on the Website"
 msgstr "Auf der Website registrieren"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 msgid "Account Added"
 msgstr "Konto wurde hinzugefügt"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 msgid "All Accounts"
 msgstr "Alle Konten"
 
 #: gajim/gtk/xml_console.py:170
 #, python-format
 msgid "Please make sure you are connected with '%s'."
-msgstr "Bitte vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
+msgstr "Bitte vergewissere dich, dass du mit \"%s\" verbunden bist."
 
 #: gajim/gtk/xml_console.py:180
 msgid "Invalid Node"
@@ -10162,220 +10117,225 @@ msgstr "Suchergebnis"
 msgid "No results found"
 msgstr "Keine Ergebnisse"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr "Fehlende Abhängigkeiten für Audio/Video"
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Standard"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 "<span color=\"red\" font-weight=\"bold\">Nicht verfügbar</span>, "
-"Unterstützung für Video wird deaktiviert"
+"Unterstützung für Video-Chats deaktiviert"
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr "<span color=\"green\" font-weight=\"bold\">OpenGL</span> beschleunigt"
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr "<span color=\"yellow\" font-weight=\"bold\">Nicht beschleunigt</span>"
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 msgid "Re-Login"
 msgstr "Erneut anmelden"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 msgid "Re-Login now?"
 msgstr "Jetzt erneut anmelden?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
-"Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
+"Wenn die Änderungen sofort übernommen werden sollen, musst du dich erneut "
 "anmelden."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr "S_päter"
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr "_Erneut anmelden"
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 msgid "Please check if Bonjour is installed."
-msgstr "Bitte überprüfen Sie, ob Bonjour installiert ist."
+msgstr "Bitte überprüfe, ob Bonjour installiert ist."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 msgid "Please check if Avahi is installed."
-msgstr "Bitte überprüfen Sie, ob Avahi installiert ist."
+msgstr "Bitte überprüfe, ob Avahi installiert ist."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 msgid "Disable Account"
 msgstr "Konto deaktivieren"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, python-format
 msgid "Account %s is still connected"
 msgstr "Das Konto %s ist gerade mit dem Server verbunden"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr "Alle Chat- und Gruppenchatfenster werden geschlossen."
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr "Bezeichnung"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr "Erkenne dein Konto anhand einer Farbe"
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr "Zugangsdaten"
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "Kontakte importieren"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-msgid "Client Certificate"
-msgstr "Client-Zertifikat"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 msgid "Connect on startup"
 msgstr "Beim Start verbinden"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 msgid "Save conversations for all contacts"
 msgstr "Unterhaltungsverlauf für alle Kontakte dieses Kontos speichern"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr "Unterhaltungsverlauf auf diesem Gerät speichern"
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 msgid "Global Status"
 msgstr "Globaler Status"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 msgid "Synchronise the status of all accounts"
 msgstr "Synchronisiere den Status aller Konten"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Proxies für Dateiübertragungen verwenden"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 msgid "Idle Time"
 msgstr "Untätigkeit"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
-msgstr "Veröffentlicht die Zeit ihrer letzten Aktivität"
+msgstr "Veröffentlicht die Zeit deiner letzten Aktivität"
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr "Lokale Systemzeit"
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr "Veröffentlicht die lokale Systemzeit des Geräts auf dem Gajim läuft"
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 msgid "Client / Operating System"
 msgstr "Client / Betriebssystem"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 msgid ""
-"Disclose informations about the client and operating system you currently use"
-msgstr "Veröffentlicht Informationen über ihren Client und ihr Betriebssystem"
+"Disclose information about the client and operating system you currently use"
+msgstr ""
+"Veröffentlicht Informationen über deinen Client und dein Betriebssystem"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 msgid "Ignore Unknown Contacts"
 msgstr "Unbekannte Kontakte blockieren"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "Kontakte blockieren, die nicht in der Kontaktliste sind"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr "Den Hostnamen für den Server manuell festlegen"
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr "Priorität"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 msgid "Use environment variable"
 msgstr "Umgebungsvariable verwenden"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 msgid "Synchronize the status of all accounts"
 msgstr "Synchronisiere den Status aller Konten"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 msgid "First Name"
 msgstr "Vorname"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 msgid "Last Name"
 msgstr "Nachname"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 msgid "Email"
 msgstr "E-Mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 msgid "Adjust to status"
 msgstr "An Status anpassen"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 msgid "Port"
 msgstr "Port"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+msgid "Client Certificate"
+msgstr "Client-Zertifikat"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PKCS12-Dateien"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 msgid "Encrypted Certificate"
 msgstr "Verschlüsseltes Zertifikat"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 msgid "Certificate Settings"
 msgstr "Zertifikatseinstellungen"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 msgid "Save Password"
 msgstr "Passwort speichern"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 msgid "Login Settings"
 msgstr "Login-Einstellungen"
 
@@ -10383,18 +10343,18 @@ msgstr "Login-Einstellungen"
 #, python-format
 msgid "<b>%s</b> would like to add some contacts to your contact list."
 msgstr ""
-"<b>%s</b> würde gerne ein paar Kontakte zu Ihrer Kontaktliste hinzufügen."
+"<b>%s</b> würde gerne ein paar Kontakte zu deiner Kontaktliste hinzufügen."
 
 #: gajim/gtk/roster_item_exchange.py:52
 #, python-format
 msgid "<b>%s</b> would like to modify some contacts in your contact list."
-msgstr "<b>%s</b> würde gerne ein paar Kontakte in Ihrer Kontaktliste ändern."
+msgstr "<b>%s</b> würde gerne ein paar Kontakte in deiner Kontaktliste ändern."
 
 #: gajim/gtk/roster_item_exchange.py:55
 #, python-format
 msgid "<b>%s</b> would like to delete some contacts from your contact list."
 msgstr ""
-"<b>%s</b> würde gerne ein paar Kontakte von Ihrer Kontaktliste löschen."
+"<b>%s</b> würde gerne ein paar Kontakte von deiner Kontaktliste löschen."
 
 #: gajim/gtk/roster_item_exchange.py:73 gajim/gtk/roster_item_exchange.py:161
 msgid "Modify"
@@ -10411,7 +10371,7 @@ msgstr "Gruppen"
 #: gajim/gtk/roster_item_exchange.py:196
 #, python-format
 msgid "%s suggested me to add you to my contact list."
-msgstr "%s hat mir vorgeschlagen Sie zu meiner Kontaktliste hinzuzufügen."
+msgstr "%s hat mir vorgeschlagen dich zu meiner Kontaktliste hinzuzufügen."
 
 #: gajim/gtk/roster_item_exchange.py:211
 #, python-format
@@ -10427,19 +10387,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d Kontakt entfernt"
 msgstr[1] "%d Kontakte entfernt"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Unbekannter Titel"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10453,20 +10413,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Gespeicherte Gruppenchats für %s"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Archiv ist kaputt"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "Archiv ist leer"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "Das Archiv beinhaltet Fehler"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Plugin existiert bereits"
@@ -10498,7 +10458,7 @@ msgstr "Plugin überschreiben?"
 
 #: gajim/plugins/gui.py:289
 msgid "Do you want to overwrite the currently installed version?"
-msgstr "Wollen Sie die derzeit installierte Version überschreiben?"
+msgstr "Willst du die derzeit installierte Version überschreiben?"
 
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "XMPP IM Client"
@@ -10520,18 +10480,18 @@ msgstr "org.gajim.Gajim"
 msgid "Show next pending event"
 msgstr "Zeige nächstes neues Ereignis"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 "Gajim zielt darauf ab, ein einfach zu benutzender und funktionsreicher XMPP-"
-"Client zu sein. Mit Gajim können Sie über verschiedene XMPP-Dienstanbieter "
-"Ihrer Wahl (z.B. Jabber.org) und über Transporte (z.B. Facebook, IRC) "
+"Client zu sein. Mit Gajim kannst du über verschiedene XMPP-Dienstanbieter "
+"deiner Wahl (z.B. Jabber.org) und über Transporte (z.B. Facebook, IRC) "
 "chatten."
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
@@ -10539,7 +10499,7 @@ msgstr ""
 "Chatte einfach mit deinen Freunden oder deiner Familie, teile Fotos und "
 "Gedanken oder diskutiere die neuesten Nachrichten mit deinen Gruppen."
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
@@ -10547,52 +10507,52 @@ msgstr ""
 "Gajim vernetzt sich gut mit deinen übrigen Geräten: Einfach auf dem PC "
 "schreiben und auf dem Handy sehen, was geschrieben wurde."
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 msgid "Features:"
 msgstr "Features:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr "Verpasse keine Nachrichten, halte alle deine Chat-Clients synchron"
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr "Lade Freunde zum Gruppenchat ein oder tritt selbst einem bei"
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 "Versende ganz einfach Fotos, Videos oder andere Dateien an Freunde und "
 "Gruppen"
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 "Chatte sicher und verschlüsselt durch Ende-zu-Ende-Verschlüsselung per OMEMO "
 "oder OpenPGP"
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr "Benutze deine liebsten Emojis, lade dein eigenes Profilbild hoch"
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr "Behalte und verwalte alle deine Unterhaltungsverläufe"
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr "Ordne deine Chats mit Tabs"
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr "Automatische Rechtschreibprüfung für deine Nachrichten"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 "Verbinde dich mit anderen Messengern durch Transporte (Facebook, IRC, ...)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
@@ -10600,59 +10560,200 @@ msgstr ""
 "Schaue Dinge bei Wikipedia, in Wörterbüchern oder anderen Suchmaschinen nach "
 "- direkt aus dem Chatfenster"
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 "Wenn du magst, teile deine Aktivität, Stimmung und die Musik, die du gerade "
 "hörst, mit deinen Freunden"
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr "Unterstützung für mehrere Konten"
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 "Gruppiere mehrere Kontakte eines bestimmten Freunds zu einem einzelnen Meta-"
 "Kontakt"
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr "XML-Konsole, um zu sehen, was auf Protokollebene passiert"
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr "Serverlose Chats im lokalen Netzwerk (Bonjour/Zeroconf)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Unterstützung für Service discovery inkl. Nodes, Benutzer-Suche"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr "Erweiterbarer Funktionsumfang durch Plugins"
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 msgid "Contact list"
 msgstr "Kontaktliste"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr "Chatfenster mit Tabs"
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 msgid "Group chat support"
 msgstr "Unterstützung von Gruppenchats"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Chat history"
 msgstr "Unterhaltungsverlauf"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 msgid "Plugin manager"
 msgstr "Plugin-Verwaltung"
 
+#~ msgid "Start New Conversation"
+#~ msgstr "Chat starten"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "Simuliere Verbindungsverlust im Netzwerk"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "Simuliere die Wiederherstellung der Netzwerkverbindung"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Unbekannter SSL-Fehler: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "Benötigt: libsecret und einen Anbieter (z.B. GNOME Keyring oder "
+#~ "KSecretService)"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Legen Sie den Zeitabstand zwischen zwei Leerlaufüberprüfungen fest."
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Kein Wörterbuch für die Sprache \"%s\" verfügbar"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Du musst das Wörterbuch \"%s\" installieren oder eine andere Sprache "
+#~ "wählen (durch die Einstellung \"speller_language\"), um die "
+#~ "Rechtschreibprüfung nutzen zu können.\n"
+#~ "\n"
+#~ "Die Hervorhebung falsch geschriebener Wörter wird nicht funktionieren"
+
+#~ msgid "_Reconnect"
+#~ msgstr "Wieder ve_rbinden"
+
+#~ msgid "Quit"
+#~ msgstr "Beenden"
+
+#~ msgid "Show Contact List"
+#~ msgstr "Kontaktliste anzeigen"
+
+#~ msgid "Add to Contact List"
+#~ msgstr "Kontakt hinzufügen"
+
+#~ msgid "Invite Contact"
+#~ msgstr "Kontakt einladen"
+
+#~ msgid "Configure Group Chat"
+#~ msgstr "Gruppenchat konfigurieren"
+
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Gruppenchat auflösen"
+
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Falls aktiviert, wird auf jedem Tab mit ungelesenen Nachrichten ein Icon "
+#~ "angezeigt. Abhängig vom Design kann dieses Icon auch animiert sein."
+
+#~ msgid "Show a mini avatar in chat window tabs and as the window's icon."
+#~ msgstr ""
+#~ "Kleines Kontaktbild in Chatfenster-Tabs und im Fenstersymbol anzeigen."
+
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "Kont_aktbild in Chat-Tabs anzeigen"
+
+#~ msgid "If checked, the contact's avatar will be shown in chat tabs"
+#~ msgstr "Falls aktiviert, wird das Kontaktbild auch im Chat-Tab angezeigt"
+
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Der Servername muss zwischen 1 und 1023 Zeichen lang sein"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Ungültiges Zeichen im Hostname."
+
+#~ msgid "Server address required."
+#~ msgstr "Server-Adresse benötigt."
+
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Der Benutzername muss zwischen 1 und 1023 Zeichen lang sein"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Ungültiges Zeichen im Benutzernamen."
+
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr ""
+#~ "Der Name der XMPP-Ressource muss zwischen 1 und 1023 Zeichen lang sein"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Ungültiges Zeichen in der XMPP-Ressource."
+
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Farbe der Benachrichtigung, wenn sich ein Kontakt anmeldet."
+
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Farbe der Benachrichtigung, wenn sich ein Kontakt abmeldet."
+
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Farbe der Benachrichtigung bei neuen Nachrichten."
+
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "Farbe der Benachrichtigung bei Anfragen zu Dateiübertragungen."
+
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "Farbe der Benachrichtigung bei Fehlern in der Dateiübertragung."
+
+#~ msgid "Notification color for stopped or completed file transfers."
+#~ msgstr ""
+#~ "Farbe der Benachrichtigung bei angehaltenen oder fertiggestellten "
+#~ "Dateiübertragungen."
+
+#~ msgid "Notification color for group chat invitations."
+#~ msgstr "Farbe der Benachrichtigung für Einladungen zu Gruppenchats."
+
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Hintergrundfarbe der Benachrichtigung bei Statusänderungen."
+
+#~ msgid "Notification color for other dialogs."
+#~ msgstr "Farbe der Benachrichtigung bei anderen Nachrichten."
+
+#~ msgid "Event Type"
+#~ msgstr "Ereignisarten"
+
+#~ msgid "Event desc"
+#~ msgstr "Ereignisbeschreibung"
+
+#~ msgid "HTTP File Upload: Enable HTTPS Verification."
+#~ msgstr "HTTP Datei-Upload: HTTPS-Zertifikat verifizieren."
+
+#~ msgid "No response from the Server"
+#~ msgstr "Server liefert keine Antwort"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Konflikt mit der XMPP-Ressource"
 
@@ -11334,9 +11435,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "_Send Private Message"
 #~ msgstr "Private Nachricht _senden"
 
-#~ msgid "Send _File"
-#~ msgstr "_Datei senden"
-
 #~ msgid "Participant Actions"
 #~ msgstr "Teilnehmeraktionen"
 
@@ -14351,9 +14449,6 @@ msgstr "Plugin-Verwaltung"
 #~ "Port festlegen.\n"
 #~ "Eventuell müssen Sie dazu Ihre Firewall-Einstellungen ändern."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Konten _zusammenführen"
-
 # TODO: GPG/PGP unification in original strings needed
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
@@ -15059,9 +15154,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Erfordert python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Erfordert gnome-keyring und python-gnome2-desktop, oder kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/el.po b/po/el.po
index 6c7f04e6c..2f95646cc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:46+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team:  <>\n"
@@ -25,77 +25,83 @@ msgstr ""
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,-1,623\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Λογαριασμοί"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Επιλογή εικόνας"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Προσωπικές συζητήσεις"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
@@ -163,503 +169,498 @@ msgstr ""
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Εκτέλεση εντολής..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Μεταφορές"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Μετονομασία"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Αφαίρεση"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Αποστολή _αρχείου"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Τελευταία κατάσταση: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Επαφές"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Προσωπική συζήτηση"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Ιστορικό"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Σύνθεση"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Όλες οι καταστάσεις"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Επαφές"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Ομαδικές συζητήσεις"
+msgid "Rename…"
+msgstr "_Μετονομασία"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Αλλαγή _θέματος"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Ομαδικές συζητήσεις"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Επιλογή εικόνας"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Αρχηγός ομάδας παραθύρων"
+msgid "Configure…"
+msgstr "_Συνέχεια"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Περιγραφή: %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Προκαθορισμένα μηνύματα:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Αλλαγή _ψευδώνυμου"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Φωνή"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Εκτέλεση εντολής..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "πριν από %i μέρες"
 msgstr[1] "πριν από %i μέρες"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Σύνθεση"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Όλες οι καταστάσεις"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "αρχείο"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "Εύρεση _υπηρεσιών"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Εξυπηρετητής"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Προχωρημένοι"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Προτιμήσεις"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Λίστα Ban"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Διαχειριστής"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Αποστολή μηνύματος διακομιστή"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Ορισμός MOTD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Ενημέρωση MOTD"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Διαγραφή MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Επεξεργασία λογαριασμού"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Επεξεργασία λογαριασμού"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Προσθήκη επαφής..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Αντιγραφή τοποθεσίας δεσμού"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Άνοιγμα δεσμού στον περιηγητή"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Άνοιγμα προγράμματος αλληλογραφίας"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Αντιγραφή τοποθεσίας δεσμού"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Ξεφορτώσου τον"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Απαγόρευση πρόσβασης"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Ιδιοκτήτης"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Διαχειριστής"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Μέλος"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Μέλος"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Φωνή"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Δωμάτιο:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "μήνυμα"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Φατσούλες:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -667,28 +668,28 @@ msgstr "Ημερομηνία"
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Θέμα"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -701,289 +702,294 @@ msgstr ""
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Εκκα_θάριση"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "You"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Πληροφορίες επαφής"
 msgstr[1] "Πληροφορίες επαφής"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 msgstr[1] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Προεπιλεγμένα μηνύματα κατάστασης"
 msgstr[1] "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα επιλεγμένα μηνύματα;"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Όνομα εικονιδίου"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Γενικά"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Ομάδα"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ορισμός MOTD"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Κανένα"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Μήνυμα κατάστασης"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Μήνυμα κατάστασης"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Αποθήκευση ως προκαθορισμένο..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Έχει"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Κατάσταση"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Όνομα"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Αποστολή _αρχείου"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Μη έγκυρο αρχείο"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Λίστα Ban"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Επισήμανση "
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Ομαδικές συζητήσεις"
@@ -998,7 +1004,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Σφάλμα:"
@@ -1027,22 +1033,22 @@ msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε μ�
 msgid "Failed to Configure Group Chat"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
@@ -1167,81 +1173,81 @@ msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από
 msgid "If you close this window, you will leave '%s'."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτά το δωμάτια."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Αποστολή & κλείσιμο"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Αποστολή & κλείσιμο"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1250,192 +1256,183 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Mέγεθος: "
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Αποδοχή"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Άνοιγμα αρχείου μενού"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Έναρξη κουβέντας"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
@@ -1445,7 +1442,7 @@ msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσ�
 msgid "desynced"
 msgstr "Προχωρημένοι"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1465,7 +1462,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Έξοδος"
@@ -1622,8 +1620,8 @@ msgstr "Ιδιοκτήτης / Ομάδα"
 msgid "Please enter a new name"
 msgstr "Δημιουργία νέου προφίλ"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "_Μετονομασία"
@@ -1642,27 +1640,32 @@ msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσε�
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1671,22 +1674,22 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1697,165 +1700,165 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Ανενεργό"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 msgstr[1] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Αποστολή"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Αποστολή %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Επεξεργασία _ομάδων"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "Αποσύνδεση επαφής"
+msgid "Execute command"
+msgstr "_Εκτέλεση εντολής..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Παρατηρητές"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1986,222 +1989,222 @@ msgstr "Προσωπικές συζητήσεις"
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Κανένα"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Αίτηση εγγραφής"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Αίτηση εγγραφής"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Εγγραφή"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Σύνδεση"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2211,20 +2214,20 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Συνδέεται"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2425,11 +2428,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
@@ -2770,78 +2773,73 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Περιγραφή: %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Άγνωστη έκδοση του D-Bus: %s"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Νέο μήνυμα από %(nickname)s"
 msgstr[1] "Νέο μήνυμα από %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "Ο %(nick)s άλλαξε κατάσταση"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Σύνδεση %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Αποσύνδεση %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
@@ -2911,79 +2909,38 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Ειδοποίηση όταν μια επαφή:"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Ειδοποίηση όταν μια επαφή:"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr ""
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Λίστα (χωρισμένη με κενά) των γραμμών (λογαριασμοί και ομάδες) που έχουν "
 "συμπτυχθεί"
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr ""
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίησης."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2992,29 +2949,29 @@ msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr ""
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr ""
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -3022,22 +2979,22 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3046,30 +3003,30 @@ msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3078,33 +3035,33 @@ msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας "
 "το gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3113,33 +3070,33 @@ msgstr ""
 "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
 "περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3147,7 +3104,7 @@ msgid ""
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3158,23 +3115,13 @@ msgstr ""
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Αν είναι αληθές, το Gajim θα εμφανίζει ένα εικονίδιο σε κάθε καρτέλα που "
-"έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
-"κίνηση."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3183,12 +3130,12 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3198,25 +3145,25 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3225,7 +3172,7 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
 "να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3244,7 +3191,7 @@ msgstr ""
 "'pertype' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
 "απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3252,194 +3199,186 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking as in the previous message."
 msgstr ""
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr ""
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3448,7 +3387,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3457,7 +3396,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3466,101 +3405,105 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr ""
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3570,17 +3513,17 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3588,17 +3531,17 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3608,158 +3551,154 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Τρώω"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Δουλεύω."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Ταινία"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Δουλειά"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Έξω"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3768,1137 +3707,1137 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Προς"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Κανένας"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Επισήμανση "
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Ομαδική συζήτηση"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Κανένας"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Λάθος διακομιστής"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cleaning"
 msgstr "Απόγευμα"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cooking"
 msgstr "Σύνθεση"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Gardening"
 msgstr "Πρωί"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "όλους στην ομάδα"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 #, fuzzy
 msgid "Dancing"
 msgstr "Απόγευμα"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 #, fuzzy
 msgid "Jogging"
 msgstr "_Συμμετοχή"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 #, fuzzy
 msgid "Skiing"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Grooming"
 msgstr "Από"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Shaving"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Ανενεργό"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Αλλαγή θέματος"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Hiding"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Praying"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Thinking"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 #, fuzzy
 msgid "Relaxing"
 msgstr "λιτό"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Fishing"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 #, fuzzy
 msgid "Gaming"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "Αποσ_ύνδεση"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Partying"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "Αιτία"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Αιτία"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 #, fuzzy
 msgid "Shopping"
 msgstr "Κοιμάμαι"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 #, fuzzy
 msgid "Smoking"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Βλέπω μια ταινία."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 #, fuzzy
 msgid "On the Phone"
 msgstr "Είμαι στο τηλέφωνο."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Traveling"
 msgstr "Μεταφέρεται"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Commuting"
 msgstr "Σύνθεση"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 #, fuzzy
 msgid "On a Plane"
 msgstr "Συνδεδεμένος"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "On a Train"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Walking"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 #, fuzzy
 msgid "Coding"
 msgstr "Σύνθεση"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 #, fuzzy
 msgid "Aroused"
 msgstr "Παύση"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Bored"
 msgstr "Έντονα"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 #, fuzzy
 msgid "Brave"
 msgstr "Έχει"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 #, fuzzy
 msgid "Cautious"
 msgstr "Συζητήσεις"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Cold"
 msgstr "Έντονα"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 #, fuzzy
 msgid "Confident"
 msgstr "_Περιεχόμενα"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Contemplative"
 msgstr "Ολοκληρώθηκε"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Contented"
 msgstr "_Περιεχόμενα"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 #, fuzzy
 msgid "Creative"
 msgstr "Ανενεργό"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 #, fuzzy
 msgid "Curious"
 msgstr "_Πίσω"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 #, fuzzy
 msgid "Dejected"
 msgstr "Διαγραφή"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "Disappointed"
 msgstr "Απενεργοποιημένο"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "Dismayed"
 msgstr "Απενεργοποιημένο"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "Distracted"
 msgstr "Απενεργοποιημένο"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "Envious"
 msgstr "_Πίσω"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 #, fuzzy
 msgid "Excited"
 msgstr "Ενεργό"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Ομάδα"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "Hot"
 msgstr "Ε_ξυπηρετητής:"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "μήνυμα"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Ενεργό"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Invincible"
 msgstr "Αφανής"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Lonely"
 msgstr "ένα"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Lost"
 msgstr "Ε_ξυπηρετητής:"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "Mean"
 msgstr "Γερμανικά"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Moody"
 msgstr "_Τροποποίηση"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 #, fuzzy
 msgid "Nervous"
 msgstr "_Πίσω"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "Offended"
 msgstr "Αποσυνδεδεμένος"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Proud"
 msgstr "Ομάδα"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "έντεκα"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 #, fuzzy
 msgid "Sad"
 msgstr "Πάγωσε"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 #, fuzzy
 msgid "Satisfied"
 msgstr "Τελευταία τροποποίηση:"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 #, fuzzy
 msgid "Serious"
 msgstr "_Πίσω"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Sick"
 msgstr "Ψευδώνυμο"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Sleepy"
 msgstr "Κοιμάμαι"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Stressed"
 msgstr "Οδός:"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Surprised"
 msgstr "Εγγεγραμμένος"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 #, fuzzy
 msgid "Tired"
 msgstr "Χρόνος"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 #, fuzzy
 msgid "Undefined"
 msgstr "Υπογράμμιση"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "Προεπιλογή"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "θαλασσί"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Χώρα:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Λογαριασμός"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Περιγραφή"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Σφάλμα:"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "ένα"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 #, fuzzy
 msgid "postalcode"
 msgstr "Τ.Κ.:"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 #, fuzzy
 msgid "room"
 msgstr "Από"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Η κατάσταση άλλαξε."
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4960,12 +4899,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4977,295 +4916,254 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Απαιτείται η διεύθυνση του διακομιστή."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Διαθέσιμος"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Προς"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Από"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Κανένας"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Ιδιοκτήτης"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Διαχειριστής"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Μέλος"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Μέλος"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "γράφει ένα μήνυμα..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Αποστολή μηνύματος"
 msgstr[1] "Αποστολή μηνύματος"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "Από %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Από %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
@@ -5362,85 +5260,85 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "Διαδρομή αρχείου"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 #, fuzzy
 msgid "File does not exist"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Αλλαγή πληροφοριών κατάστασης"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Αλλαγή κατάστασης"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Ελεύθερος για κουβέντα"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Συνδεδεμένος"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Μην ενοχλείτε"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Περιγραφή παρουσίας:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Η κατάσταση άλλαξε."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Επαφές"
@@ -5465,7 +5363,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Λογαριασμός"
 
@@ -5476,7 +5374,7 @@ msgstr "Ομαδικές συζητήσεις"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Κωδικός πρόσβασης:"
@@ -5500,7 +5398,7 @@ msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Συμμετοχή"
@@ -5518,17 +5416,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
@@ -5677,7 +5575,7 @@ msgstr "Πληροφορίες επαφής"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -5884,39 +5782,44 @@ msgstr "Δουλειά"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Περί"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Πίσω σύντομα"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5989,6 +5892,7 @@ msgid "Strike"
 msgstr "Ψευδώνυμο"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Χρώμα"
 
@@ -6002,138 +5906,133 @@ msgstr "_Γραμματοσειρά:"
 msgid "Clear formatting"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Απαγορεύεται η πρόσβαση..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Με_τά από ψευδώνυμο:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Αλλαγή _ψευδώνυμου"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Αλλαγή _θέματος"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Εισάγετε νέο κωδικό πρόσβασης:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Συμμετέχων"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 #, fuzzy
 msgid "Insert Emoji"
 msgstr "Διαχείριση Συμβόλων"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Συμμετέχων"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Απαγόρευση πρόσβασης"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Περιγραφή: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Αιτία"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Γεγονός"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Γεγονότα"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6231,20 +6130,20 @@ msgid "Add"
 msgstr "Προσθήκη"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Αφαίρεση"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Πόρος:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -6254,7 +6153,7 @@ msgid "Client"
 msgstr "Εφαρμογή:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
@@ -6396,38 +6295,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Εμφάνιση του κεντρικού παραθύρου κατά την εκκίνηση του Gajim"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Συ_γχώνευση λογαριασμών"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6436,12 +6336,12 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6450,54 +6350,54 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Επαφές"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6505,29 +6405,29 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "περιεχόμενα μηνύματος"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6537,58 +6437,58 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6597,67 +6497,70 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Τελευταία κατάσταση: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Κουβέντα"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Να επιτρέπονται οι εμφανίσεις/γνωστοποιήσεις όταν είμαι _απομακρ./μη διαθ./"
 "απασχολ./αφανής"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Να επιτρέπονται οι εμφανίσεις/γνωστοποιήσεις όταν είμαι _απομακρ./μη διαθ./"
 "απασχολ./αφανής"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6666,51 +6569,51 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου "
 "παραθύρου στο κάτω δεξιά μέρος της οθόνης"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Δια_χείριση..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Ήχος"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 #, fuzzy
 msgid "Notifications"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Μη διαθέσιμος"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6718,7 +6621,7 @@ msgid ""
 msgstr ""
 "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6726,7 +6629,7 @@ msgid ""
 msgstr ""
 "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6734,7 +6637,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6742,109 +6645,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "λεπτά"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Μήνυμα κατάστασης"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Θέμα"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Θέμα"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6854,120 +6757,130 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 #, fuzzy
 msgid "_Convert ASCII Emojis"
 msgstr "Διαχείριση Συμβόλων"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 #, fuzzy
 msgid "Style"
 msgstr "Πάγωσε"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Προσωπική συζήτηση"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Εξυπηρετητής:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Διαχείριση..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Διάφορα</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Άνοιγμα..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
@@ -7158,12 +7071,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Εισάγετε νέο κωδικό πρόσβασης:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Προχωρημένες ενέργειες"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
@@ -7250,7 +7163,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Σύν_δεση"
@@ -7264,7 +7177,7 @@ msgstr "Δημιουργία νέου προφίλ"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7294,8 +7207,8 @@ msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 msgid "Resets value to default"
 msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Εξυπηρετητής:"
@@ -7339,7 +7252,7 @@ msgstr "Μη έγκυρο όνομα χρήστη"
 msgid "Proxy Host"
 msgstr "Μεσολαβητής:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Είδος"
 
@@ -7353,8 +7266,7 @@ msgstr "_Πρωτόκολλο:"
 msgid "Copy info to clipboard"
 msgstr "_Αντιγραφή τοποθεσίας δεσμού"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 #, fuzzy
 msgid "Features"
 msgstr "Χαρακτηριστικά διακομιστή"
@@ -7534,6 +7446,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -7612,8 +7529,8 @@ msgstr "Πάγωσε"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7813,80 +7730,106 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 msgid "_Name"
 msgstr "_Όνομα:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Μεσολαβητής:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Έναρξη κουβέντας"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Διαχειριστής ιστορικού"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Η δημοσιοποίηση της vCard απέτυχε"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Προτιμήσεις"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Έξοδος"
+msgid "_Accounts"
+msgstr "Λογαριασμοί"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Προβολή"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML Κονσόλα"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Μεταφορές αρχείων"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Βοήθεια"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Συνδεδεμένος"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Συνδεδεμένος"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Χαρακτηριστικά διακομιστή"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Περί"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7901,6 +7844,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Ομαδικές συζητήσεις"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8188,60 +8136,68 @@ msgstr "Αποσύνδεση επαφής"
 msgid "Create new group chat"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Προτιμήσεις"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "μήνυμα κατάστασης"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Κονσόλα _XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Επαφές"
@@ -8319,12 +8275,16 @@ msgstr "Εκτέλεση στο Τερματικό"
 msgid "Group Chat Configuration"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML Κονσόλα"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Έναρξη συζήτησης"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Φιλτράρισμα:"
@@ -8371,11 +8331,6 @@ msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμ�
 msgid "Mute Sounds"
 msgstr "Σίγαση ήχων"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Προτιμήσεις"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8699,124 +8654,124 @@ msgstr "Η μεταφορά του αρχείου %(filename)s από τον/τ�
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Κανένας"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Επισήμανση "
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Επισήμανση "
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Κανένας"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Επισήμανση "
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Κανένας"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Κανένας"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
@@ -8845,7 +8800,7 @@ msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
@@ -8999,7 +8954,7 @@ msgstr "Αρχείο:"
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
@@ -9014,7 +8969,7 @@ msgid "Change"
 msgstr "Αλλαγή _ψευδώνυμου"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Πίσω σύντομα"
@@ -9045,11 +9000,12 @@ msgid "Password Change Failed"
 msgstr "Απαιτείται κωδικός"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
@@ -9084,42 +9040,37 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Σύνδεση"
+msgid "Start / Join Chat"
+msgstr "Έναρξη κουβέντας"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Προσθήκη επαφής..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "μη υπαρκτό %s"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9128,33 +9079,33 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Άλλα"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Ομαδική συζήτηση"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9162,146 +9113,146 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Περιήγηση"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Εντολές: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Σάρωση %d / %d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Χρήστες"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 #, fuzzy
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Εγγεγραμμένος"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Κόμβος"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "_Νέα λίστα..."
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Αποστολή μονού μηνύματος"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "θέμα"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
@@ -9348,89 +9299,75 @@ msgstr "Επιτυχής καταχώρηση λογαριασμού"
 msgid "Registration failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "για το λογαριασμό %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
@@ -9445,6 +9382,11 @@ msgstr "Αριθμός χώρων εργασίας:"
 msgid "ICQ Number"
 msgstr "Αριθμός χώρων εργασίας:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Προσθήκη επαφής..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9501,7 +9443,7 @@ msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας.
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9663,31 +9605,51 @@ msgstr "Αποσύνδεση επαφής"
 msgid "Contact Connected Background "
 msgstr "Σύνδεση επαφής"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Μήνυμα κατάστασης"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Μήνυμα κατάστασης"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Μήνυμα κατάστασης"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Μήνυμα κατάστασης"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9696,12 +9658,12 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Ενεργό"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
@@ -9726,10 +9688,9 @@ msgid "Error: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 #, fuzzy
 msgid "Error"
 msgstr "Σφάλμα:"
@@ -9744,48 +9705,48 @@ msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Απόγευμα"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Διαχείριση προφίλ μεσολαβητή"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Μεσολαβητής:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Αποσυνδεδεμένος"
@@ -9806,7 +9767,7 @@ msgstr "Λογαριασμός"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9839,60 +9800,65 @@ msgstr "_Καταχώρηση νέου λογαριασμού"
 msgid "Account has to be connected"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Συνδέεται"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "%d μη αναγνωσμένο μήνυμα"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
@@ -9952,131 +9918,131 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Επιλογή εικόνας"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Όλα τα αρχεία"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Όλα τα αρχεία"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Αποστολή αρχείου"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Εικόνες"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Επιλογή εικόνας"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Όλα τα αρχεία"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 #, fuzzy
 msgid "Connected"
 msgstr "Σύνδεση"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 #, fuzzy
 msgid "Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Όνομα αρχείου: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Λήψη"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Αποστολή"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 #, fuzzy
 msgid "Description: "
 msgstr "Περιγραφή: %s"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 #, fuzzy
 msgid "?transfer status:Paused"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Εκτύπωση όλων των σελίδων"
@@ -10085,7 +10051,7 @@ msgstr "Εκτύπωση όλων των σελίδων"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Μη έγκυρο αρχείο"
@@ -10143,26 +10109,26 @@ msgstr "Επισήμανση "
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Απαιτείται κωδικός"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Κανένα"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Άκυρο"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10181,11 +10147,6 @@ msgstr "με χρήση του λογαριασμού %s"
 msgid "Hide _Contact List"
 msgstr "Επαφές"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
@@ -10239,36 +10200,31 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Προτιμήσεις"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Προτιμήσεις"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
+msgid "Archiving Preferences Error"
+msgstr "_Προτιμήσεις"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Προσθήκη νέας εγγραφής στο μενού"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Προτιμήσεις"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Ενεργό"
@@ -10317,172 +10273,172 @@ msgstr "Τίποτα"
 msgid "?password:Hidden"
 msgstr "Κωδικός πρόσβασης:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Προτιμήσεις"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Σύνδεση"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "_Φωνή"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Απαιτείται κωδικός"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Αποθήκευση κωδικού"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Διαχειριστής ιστορικού"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Προτιμήσεις"
@@ -10530,7 +10486,7 @@ msgstr "Μη έγκυρο όνομα αρχείου"
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Επαφές"
@@ -10558,7 +10514,7 @@ msgstr "_Τέλος"
 msgid "Commands"
 msgstr "Εντολές: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10631,119 +10587,133 @@ msgstr "Αίτηση εγγραφής από %s"
 msgid "Loading"
 msgstr "Σύνθεση"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Σύνδεση"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Σύνδεση"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Πατήστε για να αλλάξετε τον κωδικό του λογαριασμού"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Συνδέεται"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 msgid "This server does not allow signup."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Δημιουργία νέου προφίλ"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Προχωρημένες ενέργειες"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Εγγραφή στο %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Λογαριασμός"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Λογαριασμοί"
@@ -10786,251 +10756,255 @@ msgstr "Αναζήτηση"
 msgid "No results found"
 msgstr "μη υπαρκτό %s"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Νέα είσοδος τώρα;"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 #, fuzzy
 msgid "_Later"
 msgstr "_Τέλος"
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Επαφές"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Μη έγκυρο όνομα χρήστη"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Όλες οι καταστάσεις"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "από τις %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Επαφές"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Π_ροτεραιότητα:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "To Session bus δεν είναι διαθέσιμο"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Όνομα:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Επώνυμο:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Νέο E-Mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Θύρα:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Σύνδεση"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Αποθήκευση κωδικού"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
@@ -11083,22 +11057,22 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Αφαιρεί μια επαφή από τη λίστα επαφών"
 msgstr[1] "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Άγνωστος τύπος %s "
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Άγνωστος τύπος %s "
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Άγνωστος τύπος %s "
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11110,21 +11084,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Διαδρομή αρχείου"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11181,127 +11155,223 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Επαφές"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Ομαδικές συζητήσεις"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Καταγραφή ιστορικού"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Σύνδεση"
+
+#, fuzzy
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Άγνωστη έκδοση του D-Bus: %s"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "Αποσύνδεση επαφής"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Έξοδος"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Προσθήκη επαφής..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Επαφές"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Ομαδικές συζητήσεις"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Αρχηγός ομάδας παραθύρων"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Αν είναι αληθές, το Gajim θα εμφανίζει ένα εικονίδιο σε κάθε καρτέλα που "
+#~ "έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
+#~ "κίνηση."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
+
+#~ msgid "Server address required."
+#~ msgstr "Απαιτείται η διεύθυνση του διακομιστή."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Ειδοποίηση όταν μια επαφή:"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Ειδοποίηση όταν μια επαφή:"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Γεγονός"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Γεγονότα"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
+
+#, fuzzy
 #~ msgid "Resource Conflict"
 #~ msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
@@ -11832,9 +11902,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Αποστολή προσωπικού μηνύματος"
 
-#~ msgid "Send _File"
-#~ msgstr "Αποστολή _αρχείου"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Συμμετέχοντες"
@@ -13698,10 +13765,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "Πάγωσε"
 
 #, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
-
-#, fuzzy
 #~ msgid "Security error during download"
 #~ msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
@@ -13859,10 +13922,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "Διαχειριστής ιστορικού"
 
 #, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Διαχειριστής ιστορικού"
-
-#, fuzzy
 #~ msgid "Hides the buttons in chat windows."
 #~ msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
@@ -14125,9 +14184,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "Use cust_om port:"
 #~ msgstr "Χρήση προσαρμοσμένης θύρας:"
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Συ_γχώνευση λογαριασμών"
-
 #, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
diff --git a/po/en_GB.po b/po/en_GB.po
index 913abc2e0..c7a430fb9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+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"
@@ -17,75 +17,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Accounts"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "and authenticated"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "and NOT authenticated"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s encryption is active %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Choose Image"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "You are going to close several tabs"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Do _not ask me again"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Privacy List"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Banning %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "If you send a file to %s, he/she will know your real Jabber ID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Continue"
 
@@ -153,502 +159,497 @@ msgstr "There is no pending subscription request."
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Show _Offline Contacts"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "I would like to add you to my contact list."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Send Single _Message"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Execute Command"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Rename"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Unblock"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Block"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Remo_ve"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Send _File"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Save File as..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Save File as..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Last state"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Invite _Contacts"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Add Contact..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "File Transfer Request"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Private Chat"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_History"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Disabled"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Composing"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "All statuses"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Invite _Contacts"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Leave Groupchats"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Leave Groupchats"
+msgid "Rename…"
+msgstr "_Rename"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Change _Subject..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Leave Groupchats"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Choose Image"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "New Group Chat"
+msgid "Configure…"
+msgstr "_Configure"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Destroying %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registration failed"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Log status changes of contacts"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Preset messages:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Minimise on close"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Minimise on Auto Join"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Change _Nickname..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voice"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Execute Command"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i days ago"
 msgstr[1] "%i days ago"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Composing"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "All statuses"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Add Contact..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Send Single _Message"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Discover Services"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Advanced"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferences"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban List"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Bookmark"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Room Configuration"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Synchronise"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Send Server Message..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Set MOTD..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Update MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Delete MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Add Contact..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Modify Account"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Modify Account"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Accounts"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Copy JID/E-mail Address"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Join Group Chat"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Add Contact..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copy JID/E-mail Address"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Open E-mail Composer"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copy Link Location"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Notification"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Copy JID/E-mail Address"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "In_vite"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Unblock"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Block"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Kick"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Ban"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Owner"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Member"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Member"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Voice"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Room JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "message"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Emoticons:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "File does not exist"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM Address:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Date"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -656,29 +657,29 @@ msgstr "Date"
 msgid "Nickname"
 msgstr "Nickname"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Message"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Subject"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Database Error"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "creating logs database"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -691,282 +692,287 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Clean _up"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "You"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Delete"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Cancel confirmation"
 msgstr[1] "Cancel confirmation"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected message?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Default Message"
 msgstr[1] "Default Message"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected messages?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "General"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Group"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "In the group"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Set Mood"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "None"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Status Message"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Overwrite Status Message?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "This name is already used. Do you want to overwrite this status message?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Status Message"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Save as Preset..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Please type a name for this status message"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Have "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Name"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You cannot synchronise with an account unless it is connected."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Send _File"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Save File as..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "File Transfers"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Invalid File"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Kicking %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Ban List"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "File Transfer Request"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s has set the subject to %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Room now shows unavailable member"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "room now does not show unavailable members"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Session WILL NOT be logged"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Information about you, as stored in the server"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Room is now fully-anonymous"
@@ -981,7 +987,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Error."
 
@@ -1010,22 +1016,22 @@ msgstr "A new room has been created"
 msgid "Failed to Configure Group Chat"
 msgstr "Leave Groupchats"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s is now known as %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s is now %(status)s"
@@ -1153,81 +1159,81 @@ msgid "If you close this window, you will leave '%s'."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s has been removed from the room (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Show a list of formattings"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "This contact does not support file transfer."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Ignore this error for this certificate."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "You just received a new message from \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Send & Close"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "New Message"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Send & Close"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1236,185 +1242,176 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s is now %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "File Transfers"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Size"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Accept"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Offline"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Open Containing Folder"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Groupchat Invitation"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Remote contact stopped transfer"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Error opening file"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "File transfer stopped"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Use t_rayicon (aka. notification area icon)"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Show only in _roster"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Advanced Configuration Editor"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Room Configuration"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Show All Pending _Events"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Start Chat"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Database Error"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transports"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Groupchats"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Authorisation has been sent"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Now \"%s\" will know your status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Authorisation has been removed"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
@@ -1424,7 +1421,7 @@ msgstr "Now \"%s\" will always see you as offline."
 msgid "desynced"
 msgstr "desync'ed"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1444,7 +1441,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Always close Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Quit"
@@ -1601,8 +1599,8 @@ msgstr "Rename Group"
 msgid "Please enter a new name"
 msgstr "Please create a clean new theme with your desired name."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Re_name"
@@ -1621,27 +1619,32 @@ msgstr "Do you want to remove group %s from the roster?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Also remove all contacts in this group from your roster"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Leave Groupchats"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Please type a new username for your local account"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1650,21 +1653,21 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1675,24 +1678,24 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "No account available"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 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."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1701,13 +1704,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1718,122 +1721,123 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Creative"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Do you want to send this file to %s:"
 msgstr[1] "Do you want to send these files to %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Send"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s to %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publish Tune"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "To all users"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "To all online users"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vite to"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Edit _Groups"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Remove"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Re_name"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Reconnect"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "_Execute Command"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_History"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "History Manager"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observers"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1962,70 +1966,70 @@ msgstr "Private Chats"
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Do you accept this request on account %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Authorisation has been sent"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Authorisation has been sent"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "None"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Subscription request"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Subscription Request"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2034,150 +2038,150 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "You are invited to a groupchat"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certificate has expired"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Password Required"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Save password"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Remote contact stopped transfer"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Error opening file"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL certificate error"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "File Transfers"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Insecure connection"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2187,20 +2191,20 @@ 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?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Connecting"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2403,11 +2407,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard publication failed"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, 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."
@@ -2733,78 +2737,73 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Destroying %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Unknown SSL error: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "New Message from %(nickname)s"
 msgstr[1] "New Message from %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "New Group Chat"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Authentication failed with \"%s\""
@@ -2872,64 +2871,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Notify me about contacts that sign _in"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Notify me about contacts that sign _out"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Preview new messages in notification popup?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Notify me when a file transfer is complete"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Notify me when a file transfer is complete"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Background colour of contacts when they just signed in."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "default"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Language used by speller"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2939,15 +2896,15 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2955,7 +2912,7 @@ msgid ""
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2964,7 +2921,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2973,17 +2930,17 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2995,23 +2952,23 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "If ticked, Gajim will display the mood of contacts in the roster window"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3020,12 +2977,12 @@ msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3034,19 +2991,19 @@ msgstr ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3055,11 +3012,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3068,15 +3025,15 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3085,7 +3042,7 @@ msgstr ""
 "Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimised)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3094,32 +3051,32 @@ msgstr ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3127,7 +3084,7 @@ msgid ""
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3137,22 +3094,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3161,13 +3109,13 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Define the position of the avatar in roster. Can be left or right"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3176,26 +3124,26 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3205,7 +3153,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3226,7 +3174,7 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3234,32 +3182,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Hides the banner in a group chat window"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Hides the banner in a group chat window"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3268,18 +3216,18 @@ 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."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3288,7 +3236,7 @@ msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3297,7 +3245,7 @@ msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3308,7 +3256,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."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3317,7 +3265,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3326,11 +3274,11 @@ msgstr ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Time of inactivity needed before the change status window closes down."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3338,11 +3286,7 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Choose interval between 2 checks of idleness."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3351,57 +3295,57 @@ msgstr ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr "If True, completion in groupchats will be like a shell auto-completion"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3410,11 +3354,7 @@ msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3422,37 +3362,37 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3461,7 +3401,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3470,7 +3410,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3479,7 +3419,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3487,7 +3427,7 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3495,28 +3435,32 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Bookmark this room"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3525,7 +3469,7 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3535,19 +3479,19 @@ 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"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "If enabled, restore the last status that was used."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 "If True, Contacts requesting authorisation will be automatically accepted."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3555,12 +3499,12 @@ msgid ""
 msgstr ""
 "If False, this account will be disabled and will not appear in roster window."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "You are not connected to the server"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3568,22 +3512,22 @@ msgid ""
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3592,7 +3536,7 @@ msgstr ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3601,20 +3545,20 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3622,17 +3566,17 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s wants to send you a file."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, 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"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3641,28 +3585,24 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "SSL certificate error"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3670,41 +3610,41 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Enable ESessions encryption for this account."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3712,91 +3652,91 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Back soon"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Eating"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "I'm working."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Movie"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Working"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "I'm working."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Phone"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Out"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "I'm available."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Be right back."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3805,1060 +3745,1060 @@ 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."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "To"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "None"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Groupchats"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Groupchat Invitation"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Groupchat Invitation"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Group Chat"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Groupchats"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "None"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Group chat creation is restricted."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "New Group Chat"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "The service could not be found"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "This is not a group chat"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Account Local already exists."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Group chat %s does not exist."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Groupchats"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Doing Chores"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Buying Groceries"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Cleaning"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Cooking"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Doing Maintenance"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Doing the Dishes"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Doing the Laundry"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Gardening"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Running an Errand"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Walking the Dog"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Drinking"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Having a Beer"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Having Coffee"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Having Tea"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Having a Snack"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Having Breakfast"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Having Dinner"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Having Lunch"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Exercising"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Cycling"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Dancing"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Hiking"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Jogging"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Playing Sports"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Running"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Skiing"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Swimming"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Working out"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Grooming"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "At the Spa"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Brushing Teeth"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Getting a Haircut"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Shaving"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Taking a Bath"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Taking a Shower"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Having an Appointment"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inactive"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Day Off"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Hanging out"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Hiding"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Praying"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Scheduled Holiday"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Thinking"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Relaxing"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Fishing"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Gaming"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Going out"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Partying"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Reading"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Rehearsing"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Shopping"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Smoking"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Socialising"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Sunbathing"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Watching TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Watching a Movie"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Talking"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "In Real Life"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "On Video Phone"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Travelling"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Commuting"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Driving"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "In a Car"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "On a Bus"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "On a Plane"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "On a Train"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "On a Trip"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Walking"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Coding"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "In a Meeting"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Studying"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Writing"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Afraid"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Amazed"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Amorous"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Angry"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Annoyed"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Anxious"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Aroused"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Bored"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Brave"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Calm"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Cautious"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Cold"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Confident"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Confused"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Contemplative"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Contented"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Cranky"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Crazy"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Creative"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Curious"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Dejected"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Depressed"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Disappointed"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Disgusted"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Dismayed"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Distracted"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Embarrassed"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Envious"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Excited"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Flirtatious"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustrated"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Grateful"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Grieving"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Grumpy"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Guilty"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Happy"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Hopeful"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Hot"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Humbled"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Humiliated"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Hungry"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Hurt"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Impressed"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "In Awe"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "In Love"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Indignant"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Interested"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Intoxicated"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Invincible"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Jealous"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Lonely"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Lost"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Lucky"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Mean"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Moody"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervous"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Offended"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Outraged"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Playful"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Proud"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Relaxed"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Relieved"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Remorseful"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Restless"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Sad"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarcastic"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Satisfied"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Serious"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Shocked"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Shy"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Sick"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontaneous"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Stressed"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Strong"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Surprised"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Thankful"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Thirsty"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Tired"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Undefined"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Weak"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Worried"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "default"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Hiding"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Country:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Account"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Description"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Error"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "one"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "room"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Unable to decode issuer public key"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "CRL signature failure"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Certificate is not yet valid"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL is not yet valid"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Self signed certificate"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Self signed certificate in certificate chain"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Unable to verify the first certificate"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certificate revoked"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Invalid CA certificate"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Unsupported certificate purpose"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certificate not trusted"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Key usage does not include certificate signing"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certificate revoked"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Unknown SSL error: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Certificate has expired"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Authorisation accepted"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Emoticons disabled"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Certificate has expired"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "E2E encryption enabled"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Extension not supported"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Authentication failed with \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4920,12 +4860,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Room Configuration"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4937,294 +4877,253 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Invalid character in hostname."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Server address required."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Invalid character in username."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Invalid character in resource."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Busy"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Busy"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Not Available"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paused"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paused"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Connecting"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "A_way"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Away"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Offline"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Unknown"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderators"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Visitors"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Visitor"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Owner"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Owner"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Member"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Member"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "is composing a message..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message pending"
 msgstr[1] "%d messages pending"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "in _group chats"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " from user %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " from %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d event pending"
 msgstr[1] "%d events pending"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "I would like to add you to my contact list."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Timeout loading image"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Image is too big"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL is not yet valid"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Timeout loading image"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is a file but it should be a directory"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
@@ -5326,83 +5225,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "File is empty"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "File does not exist"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E encryption disabled"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Change status information"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Change status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Online"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Extended away"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Sent contact: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Sent contacts:"
 
@@ -5425,7 +5324,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Account"
 
@@ -5436,7 +5335,7 @@ msgstr "Groupchats"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Password:"
@@ -5460,7 +5359,7 @@ msgstr "in _group chats"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Join"
@@ -5478,17 +5377,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -5634,7 +5533,7 @@ msgstr "Personal Information"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Description"
 
@@ -5841,39 +5740,44 @@ msgstr "Work"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "About"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Join Group Chat"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Back soon"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Join"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Removing %s account"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5942,6 +5846,7 @@ msgid "Strike"
 msgstr "Strike"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Colour"
 
@@ -5954,138 +5859,133 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Clear formating"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Choose File to Send..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Show a list of emoticons (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Banning..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "A_fter nickname:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Change _Nickname..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Change _Subject..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Enter new password:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Leave Groupchats"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "If ticked, Gajim will join this group chat on startup"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>An error has occurred:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Verify again..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Participant"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Kick"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "You may also enter an alternate venue:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Participant"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Ban"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "New Group Chat"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Destroying %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "You may also enter an alternate venue:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Reason"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Enter a new name for group %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "In_vite"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Event"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Events"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6183,20 +6083,20 @@ msgid "Add"
 msgstr "Add"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Remove"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Resource:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6206,7 +6106,7 @@ msgid "Client"
 msgstr "Client:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>System:</b>"
@@ -6348,38 +6248,39 @@ msgstr "_Window behaviour:"
 msgid "_Show contact list on startup"
 msgstr "Show _roster"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Mer_ge accounts"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Display a_vatars of contacts in roster"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6388,12 +6289,12 @@ msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Display status _messages of contacts in roster"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6402,53 +6303,53 @@ msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Display m_ood of contacts in roster"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Sort contacts by status"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Sent contacts:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "in _group chats"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Roster Item Exchange"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Spell Checker"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6460,29 +6361,29 @@ msgstr ""
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "message contents"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Show a list of formattings"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Display status _messages of contacts in roster"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6491,58 +6392,58 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Unable to join group chat"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Unable to join group chat"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Registration failed"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Log status changes of contacts"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Show close button in tab?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6551,62 +6452,65 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Show close button in tab?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Last state"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Chat"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Use t_rayicon (aka. notification area icon)"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "When new event is received:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Notify me about contacts that sign _in"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6615,50 +6519,50 @@ msgstr ""
 "Gajim will notify you for new events via a pop-up in the bottom right of the "
 "screen"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Notify me about contacts that sign _out"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Visual Notifications</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Play _sounds"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Ma_nage..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Allow sound when I'm _busy"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav Sounds"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Notifications"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Not Available"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6667,7 +6571,7 @@ msgstr ""
 "If ticked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6676,7 +6580,7 @@ msgstr ""
 "If ticked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6689,7 +6593,7 @@ msgstr ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6702,40 +6606,40 @@ msgstr ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutes"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatic status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Ask status message when I:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Sign _in"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Sign _out"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6743,68 +6647,68 @@ msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Default Message"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Enabled"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Status Message"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Preset Status Messages</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Theme"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Theme"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Configure colour and font of the interface"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Status _iconset:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Use _transports icons"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6814,117 +6718,127 @@ msgstr ""
 "from MSN will have the equivalent MSN icon for status online, away, busy, "
 "etc...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Style"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Features"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Default Message"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Private Chat"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Connection"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Server:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Manage..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Log status changes of contacts"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "If ticked, Gajim will remember the password for this account"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Miscellaneous</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Open..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Advanced Configuration Editor"
@@ -7108,12 +7022,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Enter new password:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Advanced Actions"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Use custom hostname/port"
@@ -7200,7 +7114,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Sign _in"
@@ -7214,7 +7128,7 @@ msgstr "Please create a clean new theme with your desired name."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7242,8 +7156,8 @@ msgstr "_Reset to Default Colours"
 msgid "Resets value to default"
 msgstr "_Reset to Default Colours"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Hostname:"
@@ -7287,7 +7201,7 @@ msgstr "Self signed certificate"
 msgid "Proxy Host"
 msgstr "Proxy _Host:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Type"
 
@@ -7301,8 +7215,7 @@ msgstr "_Protocol:"
 msgid "Copy info to clipboard"
 msgstr "_Copy Link Location"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Features"
 
@@ -7489,6 +7402,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Change Status Message"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Mood:</b>"
@@ -7565,8 +7483,8 @@ msgstr "Stalled"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7755,80 +7673,106 @@ msgstr "Registration failed"
 msgid "_Name"
 msgstr "_Name:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Start Chat"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Leave Groupchats"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "History Manager"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Registration failed"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Preferences"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Quit"
+msgid "_Accounts"
+msgstr "Accounts"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_View"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Show Only _Active Contacts"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Show _Offline Contacts"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Show Only _Active Contacts"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Show Trans_ports"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML Console"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "File Transfers"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Help"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Features"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "About"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7843,6 +7787,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Leave Groupchats"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8130,59 +8079,67 @@ msgstr "Roster Item Exchange"
 msgid "Create new group chat"
 msgstr "Leave Groupchats"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Preferences"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "File Transfers"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "status message"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Show _XML Console"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Appearance"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Show _Offline Contacts"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Show Only _Active Contacts"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Show Only _Active Contacts"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Contacts"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Personal Information"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Rename Contact"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Sent contacts:"
@@ -8259,12 +8216,16 @@ msgstr "Fill in the form."
 msgid "Group Chat Configuration"
 msgstr "Groupchat Invitation"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML Console"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Start Chat..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
@@ -8310,11 +8271,6 @@ msgstr "Show All Pending _Events"
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Preferences"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8634,124 +8590,124 @@ msgstr "File transfer of %(filename)s from %(name)s stopped."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "None"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s has joined the group chat"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "None"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "None"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "This group chat has no subject"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "None"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Groupchat Invitation"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Session WILL NOT be logged"
@@ -8780,7 +8736,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Recipient: "
 
@@ -8934,7 +8890,7 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Sender: "
 
@@ -8949,7 +8905,7 @@ msgid "Change"
 msgstr "Change _Nickname..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Back soon"
@@ -8980,11 +8936,12 @@ msgid "Password Change Failed"
 msgstr "Password Required"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "An error occurred during account creation"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Change Password"
 
@@ -9022,40 +8979,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Unknown SSL error: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Continued conversation"
+msgid "Start / Join Chat"
+msgstr "Start Chat"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Add Contact..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s not found"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed information"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9064,33 +9016,33 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Others"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Group Chat"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9098,142 +9050,142 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Browse"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Commands: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Search"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Edit"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Scanning %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Users"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Node"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "New post"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Send Single Message"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "subject"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Single Message"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Character not allowed"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "It is not possible to send a message to %s, this JID is not valid."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
@@ -9279,93 +9231,75 @@ msgstr "Registration succeeded"
 msgid "Registration failed"
 msgstr "Registration failed"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Dictionary for lang %s not available"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"You have to install %s dictionary to use spellchecking, or choose another "
-"language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelt words feature will not be used"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "for account %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Number:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Groupchat Invitation"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
@@ -9380,6 +9314,11 @@ msgstr "GG Number:"
 msgid "ICQ Number"
 msgstr "ICQ Number:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Add Contact..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9435,7 +9374,7 @@ msgstr "Error while adding service. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9597,31 +9536,51 @@ msgstr "Contact Disconnected"
 msgid "Contact Connected Background "
 msgstr "Contact Connected"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Status Message"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Status Message"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Status Message"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Status Message"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Invalid Nickname"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Character not allowed"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Do you really want to delete the selected message?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9629,12 +9588,12 @@ msgid ""
 msgstr ""
 "This name is already used. Do you want to overwrite this status message?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Active"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Registration failed"
@@ -9658,10 +9617,9 @@ msgid "Error: %s"
 msgstr "Error: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Error"
 
@@ -9675,48 +9633,48 @@ msgstr "Status is now: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "All files"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Cleaning"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Manage Proxy Profiles"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Adjust to status"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Offline"
@@ -9737,7 +9695,7 @@ msgstr "Account"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Your new account has been successfully created"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9769,60 +9727,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Synchronise"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "What do you want to do?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connecting"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Forward unread messages"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "A GTK+ Jabber client"
@@ -9880,127 +9843,127 @@ msgstr "Thankful"
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Choose File to Send..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Choose Image"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "All files"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "All files"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Send _File"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Images"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Choose Image"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "All files"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Save File as..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Connected"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Filename: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Download"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Upload"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "File transfer stopped"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Paused"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Paused"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Description: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Paused"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Paused"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Paused"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Paused"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Paused"
@@ -10009,7 +9972,7 @@ msgstr "Paused"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Invalid File"
@@ -10065,26 +10028,26 @@ msgstr "Group Chat Message Highlight"
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Password Required"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "None"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancel"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10103,11 +10066,6 @@ msgstr "using account %s"
 msgid "Hide _Contact List"
 msgstr "Invite _Contacts"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Show Only _Active Contacts"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Hide this menu"
@@ -10157,36 +10115,31 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Preferences"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Preferences"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "You are not connected to the server"
+msgid "Archiving Preferences Error"
+msgstr "_Preferences"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Error in received dataform"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Preferences"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Activated"
@@ -10235,180 +10188,180 @@ msgstr "None"
 msgid "?password:Hidden"
 msgstr "Password:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Preferences"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Feature not available under Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr "Ability to measure idle time, in order to set auto status."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Requires libxss library."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr "Serverless chatting with autodetected clients in a local network."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Requires python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Requires gpg and python-GnuPGInterface."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Connection"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Requires libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Feature not available under Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Notifications"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Requires python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Save password"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Passwords can be stored securely and not just in plaintext."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Spell Checker"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Requires libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Requires python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Preferences"
@@ -10454,7 +10407,7 @@ msgstr "Invalid List Name"
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Invite _Contacts"
@@ -10482,7 +10435,7 @@ msgstr "_Finish"
 msgid "Commands"
 msgstr "Commands: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10555,119 +10508,133 @@ msgstr "Subscription request from %s"
 msgid "Loading"
 msgstr "Coding"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Connected"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Log on"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Removing %s account"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Click to change account's password"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connecting"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Your server doesn't support Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Character not allowed"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Your server doesn't support Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Connection Failed"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Add Contact..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Create new post"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Custom port must be a port number."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Advanced Actions"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Banning %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Unknown SSL error: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Removing %s account"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Register to %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Account"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Accounts"
@@ -10710,250 +10677,254 @@ msgstr "Search"
 msgid "No results found"
 msgstr "No result"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Default"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "status message title"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "status message text"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Relogin now?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Relogin now?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Invalid Account"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Invalid Account"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Invite _Contacts"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Self signed certificate"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onnect on Gajim startup"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Save conversation _logs for all contacts"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "All statuses"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Use file transfer proxies"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Idle since:"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Invite _Contacts"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignore events from contacts not in the roster"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_ty:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_use HTTP__PROXY environment variable"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "First Name:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Surname:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "New E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Adjust to status"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Enable"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Connection"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Self signed certificate"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Save password"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registration failed"
@@ -11004,19 +10975,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Removes contact from roster"
 msgstr[1] "Removes contact from roster"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Unknown Artist"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Unknown Source"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11030,22 +11001,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Bookmark"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "File is empty"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Service sent malformed data"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11102,127 +11073,239 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Show All Pending _Events"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Features"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Spellchecking of composed messages."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Service Discovery using account %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Contacts"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Groupchats"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Recently:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Registration failed"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Continued conversation"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Unknown SSL error: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Choose interval between 2 checks of idleness."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Dictionary for lang %s not available"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "You have to install %s dictionary to use spellchecking, or choose another "
+#~ "language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelt words feature will not be used"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Reconnect"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Quit"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Show Only _Active Contacts"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Add Contact..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Invite _Contacts"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Leave Groupchats"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "New Group Chat"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "If True, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Invalid character in hostname."
+
+#~ msgid "Server address required."
+#~ msgstr "Server address required."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Invalid character in username."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Invalid character in resource."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Notify me about contacts that sign _in"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Notify me about contacts that sign _out"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Preview new messages in notification popup?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Notify me when a file transfer is complete"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Notify me when a file transfer is complete"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Background colour of contacts when they just signed in."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Event"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Events"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "You are not connected to the server"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Resource Conflict"
 
@@ -11846,9 +11929,6 @@ msgstr "Registration failed"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Send Private Message"
 
-#~ msgid "Send _File"
-#~ msgstr "Send _File"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Participants"
@@ -14053,10 +14133,6 @@ msgstr "Registration failed"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Stalled"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Registration failed"
-
 #~ msgid "cyan"
 #~ msgstr "cyan"
 
@@ -14568,9 +14644,6 @@ msgstr "Registration failed"
 #~ "your setup you can select another one here.\n"
 #~ "You might consider to change possible firewall settings."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Mer_ge accounts"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP is not usable on this computer"
 
@@ -15051,9 +15124,6 @@ msgstr "Registration failed"
 #~ 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"
 
diff --git a/po/eo.po b/po/eo.po
index 7ad40556d..d91cc405e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:48+0200\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -18,77 +18,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Kontoj"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Elektu bildon"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne plu demandi"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Privata listo"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Malpermesas %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Daŭrigi"
 
@@ -155,502 +161,497 @@ msgstr ""
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Sendi unuopan _mesaĝon"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Plenumi komandon..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportiloj"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Renomigi"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Forigi"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Sendi _dosieron"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Konservi dosieron kiel..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Konservi dosieron kiel..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Lasta stato: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Kontaktoj"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Aldoni kontakton..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Mendo de dosiera transmeto"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Privata interparolo"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Kontakta informo"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Historio"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "ia ajn stato"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Kontaktoj"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Nova babilejo"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Nova babilejo"
+msgid "Rename…"
+msgstr "_Renomigi"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Ŝanĝi _temon"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Nova babilejo"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Elektu bildon"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Nova babilejo"
+msgid "Configure…"
+msgstr "_Daŭrigi"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Priskribo: %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Antaŭpreparitaj mesaĝoj:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Ŝanĝi kaŝ_nomon"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voĉo"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Plenumi komandon..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "Antaŭ %i tagoj"
 msgstr[1] "Antaŭ %i tagoj"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Tajpas mesaĝon"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "ia ajn stato"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Aldoni kontakton..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "dosiero"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Sendi unuopan _mesaĝon"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Serĉi servojn"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Servilo"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Krome"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Agordo"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Listo de malpermesoj"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Starigi legosignon por tiu babilejo"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Agordo de babilejo"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Estro"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Sendi servilan mesaĝon"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Enigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Renovigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Forigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Aldoni kontakton..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Korekti konton"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Korekti konton"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopii JID/retpoŝtan adreson"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Eniri babilejen"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Babili"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Aldoni kontakton..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopii ligilan lokon"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Malfermi ligilon per retrigardilo"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopii JID/retpoŝtan adreson"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Malfermi retpoŝtredaktilon"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopii ligilan lokon"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Konta korektado"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopii JID/retpoŝtan adreson"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "In_viti al"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Elpeli"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Malpermesi"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Mastro"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Estro"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Membro"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Membro"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Voĉo"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Babilejo:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "mesaĝo"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Mienoj:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM-adreso:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -658,28 +659,28 @@ msgstr "Dato"
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Temo"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "kreadas protokolan datumbazon"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -692,286 +693,291 @@ msgstr ""
 "\n"
 "Se vi alklakos JES, bonvolu atendi..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Malplenigi"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Vi"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s je %(time)s diris: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Forigi"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Kontakta informo"
 msgstr[1] "Kontakta informo"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Defaŭlta statmesaĝo"
 msgstr[1] "Defaŭlta statmesaĝo"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi efektive volas forigi la elektitajn mesaĝojn?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnomo: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Ĝenerala"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "En la grupo"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Enigi tagmesaĝon"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Neniu"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statmesaĝo"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Statmesaĝo"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Konservi kiel antaŭpreparitaj..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Havas "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Stato"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nomo"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Servilo"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Sendi _dosieron"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Konservi dosieron kiel..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Malkorekta dosiero"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Elpelatas %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Listo de malpermesoj"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Tiu babilejo ne ekzistas."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informo pri vi, kiel estas en la servilo"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Babilejoj"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Babilejoj"
@@ -986,7 +992,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Eraro de Avahi"
@@ -1015,22 +1021,22 @@ msgstr "Via nova konto estas sukcese kreita"
 msgid "Failed to Configure Group Chat"
 msgstr "Nova babilejo"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s nomiĝas %s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Vi nomiĝas %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s nun estas %(status)s"
@@ -1155,81 +1161,81 @@ msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Se vi fermos tiun fenestron, vi senkonektiĝos de tiu ĉi babilejo."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Sendi kaj fermi"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Sendi kaj fermi"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1238,189 +1244,180 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Longo: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Akcepti"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Senkonekta"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Malfermi enhavantan dosierujon"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Babileja invitilo"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Eraro dum legado de dosiero:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Dosiera transmeto nuligitas"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Konekto kun punkto neestableblas."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Uzi pletpiktogramon"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Montri nur en _kontaktlisto"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Detala agorda administrilo"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Agordo de babilejo"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Antaŭigas fenestron kun la sekva atendanta evento"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Babili"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transportiloj"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Babilejoj"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Permeso estas sendita"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Se \"%s\" akceptas tiun peton vi povos koni lian aŭ ŝian staton."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Permeso estas forigita"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
@@ -1430,7 +1427,7 @@ msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 msgid "desynced"
 msgstr "Krome"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1450,7 +1447,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Eliri"
@@ -1599,8 +1597,8 @@ msgstr "Renomigi grupon"
 msgid "Please enter a new name"
 msgstr "Nova mesaĝo"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Re_nomigi"
@@ -1619,27 +1617,32 @@ msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Forigi ankaŭ ĉiujn kontaktojn de la grupo el via kontaktlisto"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Nova babilejo"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1648,22 +1651,22 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Permesi al tiu ĉi konto koni mian staton post forigado"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1674,24 +1677,24 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1700,12 +1703,12 @@ msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1716,126 +1719,126 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Malŝaltita"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "%s volas sendi al vi dosieron:"
 msgstr[1] "%s volas sendi al vi dosieron:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Sendi"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Sendi %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publici"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viti al"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Aranĝi _Grupojn"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Forigi"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Re_nomigi"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "Kontakto malkonektita"
+msgid "Execute command"
+msgstr "_Plenumi komandon..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historio"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Rigardiloj"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1965,221 +1968,221 @@ msgstr "Privataj interparoloj"
 msgid "Messages"
 msgstr "Mesaĝoj"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Permeso estas sendita"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Permeso estas sendita"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Neniu"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Mendo de abono"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Mendo de abono"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Malaboni"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Eraro dum legado de dosiero:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_O kej"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Konekto"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2187,20 +2190,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Konektas"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2401,11 +2404,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vi ne plu ĉeestas en babilejo \"%s\" aŭ \"%s\" foriris."
@@ -2733,78 +2736,73 @@ msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s estas dosierujo sed devas esti dosiero"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Priskribo: %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nekonata versio de D-BUS: %s"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Nova mesaĝo de %(nickname)s"
 msgstr[1] "Nova mesaĝo de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Nova babilejo"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ŝanĝis staton"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s ensalutis"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s elsalutis"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
@@ -2868,64 +2866,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Avizi min pri kontaktoj kiuj: "
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Avizi min pri kontaktoj kiuj: "
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Montri eventon en _kontaktlisto"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Avizi min kiam dosiero estas transdonita"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Avizi min kiam dosiero estas transdonita"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 #, fuzzy
 msgid "default"
 msgstr "Defaŭlte"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Lingvo uzata de literumilo"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2935,15 +2891,15 @@ msgstr ""
 "'sometimes' - eligi tempon ĉiun print_ichat_every_foo_minutes minuton.\n"
 "'never' - neniam eligi tempon."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Trakti parojn * / _ kiel stiligajn signojn."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2952,7 +2908,7 @@ msgstr ""
 "Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
 "* *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2961,7 +2917,7 @@ msgstr ""
 "Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
 "babilejo."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2970,17 +2926,17 @@ msgstr ""
 "Signo por aligi post dezirata kaŝnomo kiam iu alia en babilejo jam okupis "
 "tiun kaŝnomon."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2993,24 +2949,24 @@ msgstr ""
 "vidu pitonan dokumentaron pri la funkcio \"strftime\": http://docs.python."
 "org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Signoj kiuj eligotas antaŭ kaŝnomo en konversacioj"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Signoj kiuj eligotas post kaŝnomo en konversacioj"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3019,30 +2975,30 @@ msgstr ""
 "Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
 "malfermas denove."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Sendi mesaĝon per Ctrl+Enter kaj Enter faras novan lineon (defaŭlta "
 "kondutmaniero de Mirabilis ICQ Kliento)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Kiom lineojn memori por Ctrl+Supren."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3051,11 +3007,11 @@ msgstr ""
 "Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
 "\" kio signifas uzi wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se markitas, oni eblas komandi al Gajim malproksime per gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3064,21 +3020,21 @@ msgstr ""
 "Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
 "ĉiujn x minutojn."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3087,32 +3043,32 @@ msgstr ""
 "Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
 "adrestradukado."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Avizi eventojn en la sistema taskopleta bildeto."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3120,7 +3076,7 @@ msgid ""
 msgstr ""
 "Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3130,22 +3086,13 @@ msgstr ""
 "Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
 "Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
-"nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3154,12 +3101,12 @@ msgstr ""
 "Se estas \"True\", Gajim montros statmesaĝojn, se ĝi ne estas malplena, por "
 "ĉiu kontakto sub la kontaktnomo en la kontaktlisto."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3168,26 +3115,26 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3197,7 +3144,7 @@ msgstr ""
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3217,7 +3164,7 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3225,32 +3172,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Se \"True\", premo de la klavo \"Escape\" fermas slipon/fenestron."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Kaŝas la liston de partoprenantoj en la babileja fenestro."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3259,18 +3206,18 @@ msgstr ""
 "En konversacio, montri la kaŝnomon komence de linio nur kiam tiu ne estas la "
 "sama persono dirinta ĉi-antaŭan mesaĝon."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab iras al sekva konversacian langeton se ĉiuj legitas."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3279,7 +3226,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3288,7 +3235,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3299,7 +3246,7 @@ msgstr ""
 "nombroj en la konta korekdada fenestro. GARDU VIN, se vi ensalutis kun "
 "negativa prioritato, vi ricevos neniujn mesaĝojn de via servilo."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3308,92 +3255,84 @@ msgstr ""
 "Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
 "kontaj kaj grupaj linioj."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3401,58 +3340,58 @@ msgstr ""
 "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
 "pasvortojn."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3461,7 +3400,7 @@ msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3470,28 +3409,32 @@ msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Starigi legosignon por tiu babilejo"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3500,62 +3443,62 @@ msgstr ""
 "Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
 "agorderoj \"autopriority_*\"."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3564,33 +3507,33 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3599,28 +3542,24 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Aligado de speciala avizo por %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3629,41 +3568,41 @@ msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3672,91 +3611,91 @@ msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Manĝas"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Mi laboras."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Kino"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Laboras"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefonado"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Eliris"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3765,1132 +3704,1132 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Al"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Neniu"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Babilejoj"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Babileja invitilo"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Babileja invitilo"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Babilejo"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Babilejoj"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Neniu"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Babileja kreado limigitas."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Nova babilejo"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Neniu servo estas trovita"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Tio ne estas babilejo"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Loka konto jam ekzistas."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Tiu babilejo ne ekzistas."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Babilejoj"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Malprava servilnomo"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cleaning"
 msgstr "Vespero"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cooking"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Gardening"
 msgstr "Mateno"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "ĉiuj en la grupo"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "Laboras"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 #, fuzzy
 msgid "Dancing"
 msgstr "Vespero"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "Elpelatas %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 #, fuzzy
 msgid "Jogging"
 msgstr "_Aliĝi"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 #, fuzzy
 msgid "Skiing"
 msgstr "Laboras"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "Laboras"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Grooming"
 msgstr "babilejo"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Shaving"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Neaktiva"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Korektas temon"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Hiding"
 msgstr "Elpelatas %s"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Praying"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Thinking"
 msgstr "Laboras"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Fishing"
 msgstr "Elpelatas %s"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 #, fuzzy
 msgid "Gaming"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "E_lsalutas"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Partying"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "Kialo"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Kialo"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 #, fuzzy
 msgid "Shopping"
 msgstr "Dormas"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 #, fuzzy
 msgid "Smoking"
 msgstr "Laboras"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Mi spektas filmon."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 #, fuzzy
 msgid "On the Phone"
 msgstr "Mi telefonas."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Traveling"
 msgstr "Transdonas"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Commuting"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "On a Train"
 msgstr "Malfermi  kiel _ligilon"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Walking"
 msgstr "Laboras"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 #, fuzzy
 msgid "Coding"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "Laboras"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 #, fuzzy
 msgid "Aroused"
 msgstr "Paŭzas"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Bored"
 msgstr "Dika"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 #, fuzzy
 msgid "Brave"
 msgstr "Havas "
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 #, fuzzy
 msgid "Cautious"
 msgstr "Babilejoj"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Cold"
 msgstr "Dika"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 #, fuzzy
 msgid "Confident"
 msgstr "_Enhavo"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Contemplative"
 msgstr "Plenumita"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Contented"
 msgstr "_Enhavo"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 #, fuzzy
 msgid "Creative"
 msgstr "Malŝaltita"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 #, fuzzy
 msgid "Dejected"
 msgstr "Forigi"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "Disappointed"
 msgstr "malŝaltitaj"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "Dismayed"
 msgstr "malŝaltitaj"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "Distracted"
 msgstr "malŝaltitaj"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 #, fuzzy
 msgid "Excited"
 msgstr "Ŝaltita"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "Hot"
 msgstr "_Retnodo:"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "mesaĝo"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Ŝaltita"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Invincible"
 msgstr "Nevidebla"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Lonely"
 msgstr "unu"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Lost"
 msgstr "_Retnodo:"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "Mean"
 msgstr "Germana"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Moody"
 msgstr "_Korekti"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "Offended"
 msgstr "Senkonekta"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "dekunu"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 #, fuzzy
 msgid "Sad"
 msgstr "Malrapidas"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Sick"
 msgstr "Kaŝnomo"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Sleepy"
 msgstr "Dormas"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Stressed"
 msgstr "Strato:"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Surprised"
 msgstr "Abonita"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 #, fuzzy
 msgid "Undefined"
 msgstr "Substreko"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "Defaŭlte"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "mara"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Elpelatas %s"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Konto"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Priskribo"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Eraro de Avahi"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "unu"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "babilejo"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Pasfrazo necesas"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Permespeto akceptitas"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Ĉifrado malebligata"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Pasfrazo necesas"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Ĉifrado ebligata"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4952,12 +4891,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Agordo de babilejo"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4969,295 +4908,254 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Malkorekta signo en servilnomo."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Necesas adreso de servilo."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Malkorekta signo en salutnomo."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Malkorekta signo en risurcnomo."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Okupata"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Nedisponebla"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paŭzas"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paŭzas"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Konektas"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Fora"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Fora"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Al"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Mastro"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Mastro"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administristo"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administristo"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "tajpas mesaĝon..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Sendi mesaĝon"
 msgstr[1] "Sendi mesaĝon"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "Eniri en babilejon"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s estas dosiero sed devas esti dosierujo"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim fermos tuj"
 
@@ -5358,91 +5256,91 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "Dosierindiko"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tiu babilejo ne ekzistas."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Ĉifrado malebligata"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontakta informo"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 #, fuzzy
 msgid "Change status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 #, fuzzy
 msgid "Free for chat"
 msgstr "Babilema"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 #, fuzzy
 msgid "Online"
 msgstr "naŭ"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ne malhelpu."
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 #, fuzzy
 msgid "Presence description:"
 msgstr "Priskribo"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktoj"
@@ -5467,7 +5365,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Konto"
 
@@ -5478,7 +5376,7 @@ msgstr "Babilejoj"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Pasvorto:"
@@ -5502,7 +5400,7 @@ msgstr "Eniri en babilejon"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Aliĝi"
@@ -5520,17 +5418,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Nuligi"
 
@@ -5679,7 +5577,7 @@ msgstr "Kontakta informo"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Priskribo"
 
@@ -5887,39 +5785,44 @@ msgstr "Laboro"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Pri si"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Eniri babilejen"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Revenos baldaŭ"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Aliĝi"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Forigado de konto %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5992,6 +5895,7 @@ msgid "Strike"
 msgstr "Kaŝnomo"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Koloro"
 
@@ -6005,134 +5909,129 @@ msgstr "_Tiparo:"
 msgid "Clear formatting"
 msgstr "Kontakta informo"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Elektu dosieron por sendi..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Malpermesas..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Post kaŝnomo:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Ŝanĝi kaŝ_nomon"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Ŝanĝi _temon"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Enigu novan pasvorton:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Nova babilejo"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/data/gui/groupchat_control.ui:1018
-msgid "An error occured"
+#: gajim/data/gui/groupchat_control.ui:1063
+msgid "An error occurred"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Partoprenanto"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Elpeli"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Partoprenanto"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Malpermesi"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Nova babilejo"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Priskribo: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Kialo"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "In_viti al"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Evento"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Eventoj"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6230,20 +6129,20 @@ msgid "Add"
 msgstr "Aldoni"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Forigi"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Risurco:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Stato"
 
@@ -6253,7 +6152,7 @@ msgid "Client"
 msgstr "Kliento:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Propraj</b>"
@@ -6395,38 +6294,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Montri _kontaktliston"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Unuigi kontojn"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6435,12 +6335,12 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6449,54 +6349,54 @@ msgstr ""
 "Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
 "la kontaktlisto kaj en babilejoj"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordigi kontaktojn per stato"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Kontaktoj"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "Eniri en babilejon"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Kontakto malkonektita"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6504,29 +6404,29 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "mesaĝenhavo"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6535,121 +6435,122 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Konektado malsukcesis"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Lasta stato: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Babilejo"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Uzi pletpiktogramon"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Kiam ricevas novan eventon"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6658,63 +6559,63 @@ msgstr ""
 "Gajim avizos vin pri novaj eventoj per ŝprucfenestro en la malsupra dekstra "
 "angulo de la ekrano"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Bildavizoj</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Ludi _sonojn"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Admi_nistri..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav-sonoj"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 #, fuzzy
 msgid "Notifications"
 msgstr "Konta korektado"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Nedisponebla"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6722,7 +6623,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6730,109 +6631,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutoj"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Demandi statmesaĝon kiam mi:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "E_nsalutas"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "E_lsalutas"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Defaŭlta statmesaĝo"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Ebligi"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Statmesaĝo"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Etoso"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Etoso"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Agordo de koloro kaj tiparo de la fasado"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Defaŭlta stata p_iktogramaro:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Uzi _transportilajn piktogramarojn"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6842,119 +6743,129 @@ msgstr ""
 "kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
 "fora, okupata ktp...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 #, fuzzy
 msgid "Style"
 msgstr "Malrapidas"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Servilaj trajtoj"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Defaŭlta statmesaĝo"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Privata interparolo"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Konekto"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Servilo:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Administri..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Cetero</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Malfermi..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Detala agorda administrilo"
@@ -7145,12 +7056,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Enigu novan pasvorton:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Kromaj agoj"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Uzi propran servilnomon/pordon"
@@ -7237,7 +7148,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "E_nsalutas"
@@ -7251,7 +7162,7 @@ msgstr "Nova mesaĝo"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7280,8 +7191,8 @@ msgstr "_Reŝargi kolorojn per defaŭlto"
 msgid "Resets value to default"
 msgstr "_Reŝargi kolorojn per defaŭlto"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Servilnomo: "
@@ -7325,7 +7236,7 @@ msgstr "Malkorekta salutnomo"
 msgid "Proxy Host"
 msgstr "Prokura servilo:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Datumtipo"
 
@@ -7339,8 +7250,7 @@ msgstr "_Protokolo:"
 msgid "Copy info to clipboard"
 msgstr "_Kopii ligilan lokon"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 #, fuzzy
 msgid "Features"
 msgstr "Servilaj trajtoj"
@@ -7526,6 +7436,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Ŝanĝi stat_mesaĝon"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -7604,8 +7519,8 @@ msgstr "Malrapidas"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7797,80 +7712,106 @@ msgstr "Konektado malsukcesis"
 msgid "_Name"
 msgstr "_Nomo:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Prokura servilo:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Babili"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Nova babilejo"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Historia administrilo"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Konektado malsukcesis"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Agordo"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Eliri"
+msgid "_Accounts"
+msgstr "Kontoj"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Vido"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Montri _senkonektajn kontaktojn"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Montri Trans_portilojn"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML-konzolo"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Dosieraj transmetoj"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Helpo"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "naŭ"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "naŭ"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Servilaj trajtoj"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Pri si"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7885,6 +7826,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Nova babilejo"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8168,60 +8114,68 @@ msgstr "Kontakto malkonektita"
 msgid "Create new group chat"
 msgstr "Nova babilejo"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Agordo"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "statmesaĝo"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Montri _XML-konzolon"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Redakti regulon</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Kontakta informo"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Renomigado de kontakto"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Kontaktoj"
@@ -8298,12 +8252,16 @@ msgstr "Plenigu la formon."
 msgid "Group Chat Configuration"
 msgstr "Babileja invitilo"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML-konzolo"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Ekparoli"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filtrilo:"
@@ -8350,11 +8308,6 @@ msgstr "Montri ĉiujn nelegitajn _eventojn"
 msgid "Mute Sounds"
 msgstr "Silentigi sonojn"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Agordo"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8677,124 +8630,124 @@ msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Neniu"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Babilejoj"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Neniu"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Babilejoj"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Neniu"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Tiu ĉi babilejo ne havas temon"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Babilejoj"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Babilejoj"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Babilejoj"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Neniu"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Babileja invitilo"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Vi nekonektitas al la servilo"
@@ -8823,7 +8776,7 @@ msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
@@ -8976,7 +8929,7 @@ msgstr "Dosiero: "
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Sendanto: "
 
@@ -8991,7 +8944,7 @@ msgid "Change"
 msgstr "Ŝanĝi kaŝ_nomon"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Revenos baldaŭ"
@@ -9022,11 +8975,12 @@ msgid "Password Change Failed"
 msgstr "Pasvorto necesas"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Eraro okazis dum kreado de konto"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Ŝanĝi pasvorton"
 
@@ -9061,40 +9015,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Konekto"
+msgid "Start / Join Chat"
+msgstr "Babili"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Aldoni kontakton..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s ne trovitas"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9103,33 +9052,33 @@ msgstr ""
 "Tiu ĉi servo ne povis respondi per detala informo.\n"
 "Ĝi verŝajne estas malnova aŭ rompita"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Aliaj"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Babilejo"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9137,145 +9086,145 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Tiu tipo de servo ne enhavas erojn por rigardi."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Rigardi"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Komandoj: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Serĉi"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "A_dministri"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanas %d / %d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Uzuloj"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 #, fuzzy
 msgid "Node"
 msgstr "Neniu"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nova mesaĝo"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Sendi unuopan mesaĝon"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "temo"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
@@ -9322,91 +9271,75 @@ msgstr "Vizitkarto estas sukcese publicita"
 msgid "Registration failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Vortaro mankas por %s lingvo"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
-"lingvon ĉe la agordero \"speller_language\"."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "por konto %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG numero:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Babileja invitilo"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
@@ -9421,6 +9354,11 @@ msgstr "GG numero:"
 msgid "ICQ Number"
 msgstr "ICQ numero:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Aldoni kontakton..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9476,7 +9414,7 @@ msgstr "eraro dum aldonado de servo %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9638,31 +9576,51 @@ msgstr "Kontakto malkonektita"
 msgid "Contact Connected Background "
 msgstr "Kontakto konektita"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Statmesaĝo"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Statmesaĝo"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Statmesaĝo"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Statmesaĝo"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9670,12 +9628,12 @@ msgid ""
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktiva"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Konektado malsukcesis"
@@ -9699,10 +9657,9 @@ msgid "Error: %s"
 msgstr "Erara mesaĝo: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr ""
 
@@ -9716,48 +9673,48 @@ msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Vespero"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Administri prokurservilajn agordojn"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Prokura servilo:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Senkonekta"
@@ -9778,7 +9735,7 @@ msgstr "Konto"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Via nova konto estas sukcese kreita"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9810,60 +9767,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Montri _senkonektajn kontaktojn"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Kion vi volas fari?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Konektas"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr " %d nelegita mesaĝo"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+bazita jabber-kliento"
@@ -9919,130 +9881,130 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Elektu dosieron por sendi..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Elektu bildon"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Ĉiuj dosieroj"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Ĉiuj dosieroj"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Sendi dosieron"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Bildoj"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elektu bildon"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Ĉiuj dosieroj"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Konservi dosieron kiel..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de tiu ĉi babilejo"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 #, fuzzy
 msgid "Connected"
 msgstr "Konekto"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Dosiernomo: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Elŝuti"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Alŝuti"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Dosiera transmeto haltitas"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Paŭzas"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Paŭzas"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 #, fuzzy
 msgid "Description: "
 msgstr "Priskribo: %s"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Paŭzas"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Paŭzas"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Paŭzas"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Paŭzas"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Paŭzas"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Paŭzas"
@@ -10051,7 +10013,7 @@ msgstr "Paŭzas"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Malkorekta dosiero"
@@ -10109,26 +10071,26 @@ msgstr "Emfazado de mesaĝoj en babilejo"
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Pasvorto necesas"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Neniu"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Nuligi"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10147,11 +10109,6 @@ msgstr "per konto %s"
 msgid "Hide _Contact List"
 msgstr "Kontaktoj"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Montri _senkonektajn kontaktojn"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
@@ -10199,35 +10156,30 @@ msgid ""
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Agordo"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Agordo"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Vi nekonektitas al la servilo"
+msgid "Archiving Preferences Error"
+msgstr "_Agordo"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Agordo"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Ŝaltita"
@@ -10276,172 +10228,172 @@ msgstr "Nenion"
 msgid "?password:Hidden"
 msgstr "Pasvorto:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Agordo"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "La aŭtomate nedisponebla statmesaĝo"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Konekto"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "_Voĉo"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "La aŭtomate nedisponebla statmesaĝo"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Konta korektado"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Pasvorto necesas"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Konservi pasvorton"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Historia administrilo"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Agordo"
@@ -10487,7 +10439,7 @@ msgstr "Malkorekta listnomo"
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Kontaktoj"
@@ -10515,7 +10467,7 @@ msgstr "_Finigi"
 msgid "Commands"
 msgstr "Komandoj: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10588,119 +10540,133 @@ msgstr "Demando pri abono de %s"
 msgid "Loading"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Konekto"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "E_nsaluti"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Forigado de konto %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Klaku por ŝanĝi konta pasvorton"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Konektas"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Via servilo ne subtenas Vizitkarton"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Aldoni kontakton..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Nova mesaĝo"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "La pordo devas esti nombro."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Kromaj agoj"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Malpermesas %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Forigado de konto %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registri ĉe %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Konto"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Kontoj"
@@ -10743,247 +10709,251 @@ msgstr "Serĉi"
 msgid "No results found"
 msgstr "%s ne trovitas"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Ĉu rekonektu nun?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Malkorekta kontnomo"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Malkorekta kontnomo"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kontaktoj"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Malkorekta salutnomo"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "K_onekti dum lanĉo de Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "ia ajn stato"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Uzi dosiertransmetan prokuran servilon"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " ekde %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kontaktoj"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tato:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Konekto mankas"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Nomo:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Familia nomo:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Nova retletero"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Ebligi"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Pordo:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Konekto"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Malkorekta salutnomo"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Konservi pasvorton"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Konektado malsukcesis"
@@ -11036,19 +11006,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Forigas kontakton el kontaktlisto"
 msgstr[1] "Forigas kontakton el kontaktlisto"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11060,21 +11030,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Starigi legosignon por tiu babilejo"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Dosierindiko"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11131,127 +11101,237 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Servilaj trajtoj"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Serĉado de servoj per konto %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontaktoj"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Babilejoj"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Antaŭ nelonge:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Konektado malsukcesis"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Konekto"
+
+#, fuzzy
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Nekonata versio de D-BUS: %s"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Vortaro mankas por %s lingvo"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
+#~ "lingvon ĉe la agordero \"speller_language\"."
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "Kontakto malkonektita"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Eliri"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Montri _senkonektajn kontaktojn"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Aldoni kontakton..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Kontaktoj"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Nova babilejo"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Nova babilejo"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo "
+#~ "enhavas nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti "
+#~ "animaciata."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Malkorekta signo en servilnomo."
+
+#~ msgid "Server address required."
+#~ msgstr "Necesas adreso de servilo."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Malkorekta signo en salutnomo."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Malkorekta signo en risurcnomo."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Avizi min pri kontaktoj kiuj: "
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Avizi min pri kontaktoj kiuj: "
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Montri eventon en _kontaktlisto"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Avizi min kiam dosiero estas transdonita"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Avizi min kiam dosiero estas transdonita"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Evento"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Eventoj"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Vi nekonektitas al la servilo"
+
+#, fuzzy
 #~ msgid "Resource Conflict"
 #~ msgstr "Konflikto de salutnomoj"
 
@@ -11812,9 +11892,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Sendi privatan mesaĝon"
 
-#~ msgid "Send _File"
-#~ msgstr "Sendi _dosieron"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Partoprenantoj"
@@ -13675,10 +13752,6 @@ msgstr "Konektado malsukcesis"
 #~ msgstr "Malrapidas"
 
 #, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Konektado malsukcesis"
-
-#, fuzzy
 #~ msgid "Security error during download"
 #~ msgstr "Etraro de sekureco dum konektado al \"%s\""
 
@@ -13828,10 +13901,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Network-Watcher"
 #~ msgstr "Historia administrilo"
 
-#, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Historia administrilo"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -14107,9 +14176,6 @@ msgstr "Konektado malsukcesis"
 #~ "agordo, vi povas elekti alian ĉi tie.\n"
 #~ "Vi povas pripensi ŝanĝon de permeseblaj parametroj de retŝirmilo."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Unuigi kontojn"
-
 #, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
diff --git a/po/es.po b/po/es.po
index b70625aaa..a3d48c043 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:49+0200\n"
 "Last-Translator: Membris Khan <frank@giingo.org>\n"
 "Language-Team: none <>\n"
@@ -18,87 +18,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, python-format
+msgid "Account: %s"
+msgstr "Cuenta: %s"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "y autentificado"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "y NO autenticado"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "El cifrado %(type)s está activo %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Limpiar"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "Pegar como cita"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "Pegar Imagen"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr "Estás intentando pegar una imagen"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "¿Estás seguro de querer pegar la imagen del portapapeles en el chat?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "No preguntarme de nuevo"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Advertencia"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "Si envía un archivo a <b>%s</b>, se sabrá su JID real."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Continuar"
 
 #: gajim/vcard.py:263
 msgid "?Client:Unknown"
-msgstr "Desconocido"
+msgstr "?Client:Desconocido"
 
 #: gajim/vcard.py:268
 msgid "?OS:Unknown"
-msgstr "Desconocido"
+msgstr "?OS:Desconocido"
 
 #: gajim/vcard.py:298 gajim/vcard.py:301
 msgid "?Time:Unknown"
-msgstr "Desconocida"
+msgstr "?Time:Desconocida"
 
 #: gajim/vcard.py:352
 msgid "?Role in Group Chat:<b>Role:</b>"
-msgstr "?Role en el chat grupal:<b>Role:</b>"
+msgstr "?Role in Group Chat:<b>Rol:</b>"
 
 #: gajim/vcard.py:356
 msgid "<b>Affiliation:</b>"
@@ -146,428 +152,423 @@ msgstr "No hay ninguna suscripción pendiente."
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 msgid "Not in contact list"
 msgstr "No en la lista de contactos"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 msgid "I would like to add you to my contact list"
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Enviar _mensaje inidividual…"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "_Ejecutar comando…"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Gestionar transporte"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "_Renombrar…"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Información"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Enviar archivo…"
+#: gajim/gui_menu_builder.py:517
+msgid "Send File"
+msgstr "Enviar fichero"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
 msgstr "Subir archivo..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr "Enviar archivo directamente..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 msgid "Send Chatstate"
 msgstr "Enviar estado"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
-msgstr "Invitar contactos"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+msgid "Invite Contacts…"
+msgstr "Invitar contactos…"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
-msgid "Add to Contact List"
-msgstr "Añadir a la lista de contactos"
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
+msgid "Add to Contact List…"
+msgstr "Añadir a la lista de contactos…"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 msgid "Voice Chat"
 msgstr "Chat de voz"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 msgid "Video Chat"
 msgstr "Chat de vídeo"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "Información"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "Historial"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+msgid "Composing Only"
 msgstr "Solo componiendo"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
+#: gajim/gui_menu_builder.py:535
+msgid "All Chat States"
 msgstr "Todos los estados de chat"
 
-#: gajim/gui_menu_builder.py:575
-msgid "Invite Contact"
-msgstr "Invitar contacto"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 msgid "Manage Group Chat"
 msgstr "Gestionar grupos de chat"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
-msgid "Rename Group Chat"
-msgstr "Renombrar el grupo"
-
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
-msgstr "Cambiar asunto"
+#: gajim/gui_menu_builder.py:575
+msgid "Rename…"
+msgstr "Renombrar…"
 
-#: gajim/gui_menu_builder.py:579
-msgid "Configure Group Chat"
-msgstr "Configurar grupos de charla"
+#: gajim/gui_menu_builder.py:576
+msgid "Change Subject…"
+msgstr "Cambiar asunto…"
 
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "Subir Imagen…"
 
-#: gajim/gui_menu_builder.py:581
-msgid "Destroy Group Chat"
-msgstr "Destruir grupo de chat"
+#: gajim/gui_menu_builder.py:578
+msgid "Configure…"
+msgstr "Configurar…"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+msgid "Destroy…"
+msgstr "Destruir…"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 msgid "Chat Settings"
 msgstr "Preferencias de conversación"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr "Mostrar unirse/abandonar"
 
-#: gajim/gui_menu_builder.py:585
-msgid "Show status changes"
+#: gajim/gui_menu_builder.py:583
+msgid "Show Status Changes"
 msgstr "Mostrar cambios de estado"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
+#: gajim/gui_menu_builder.py:584
+msgid "Notify on all Messages"
 msgstr "Notificar para todos los mensajes"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr "Minimizar al cerrar"
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr "Minimizar al unirse automáticamente"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "Umbral de sincronización"
 
-#: gajim/gui_menu_builder.py:593
-msgid "Change Nickname"
-msgstr "Cambiar alias"
+#: gajim/gui_menu_builder.py:591
+msgid "Change Nickname…"
+msgstr "Cambiar alias…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "Petición de voz"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "Ejecutar comando"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+msgid "Execute Command…"
+msgstr "Ejecutar comando…"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr "Abandonar"
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "Sin umbral"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "hace %i día"
 msgstr[1] "hace %i días"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Solo componiendo"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Todos los estados de chat"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
 msgstr "Añadir contacto..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Perfil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "Enviar mensaje único..."
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
-msgstr "Descubrir servicios"
+#: gajim/gui_menu_builder.py:674
+msgid "Discover Services…"
+msgstr "Descubrir servicios…"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "Información del Servidor"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "Preferencias de archivado"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 msgid "Blocking List"
 msgstr "Lista de bloqueo"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 msgid "PEP Configuration"
 msgstr "Configuración PEP"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
-msgstr "Sincronizar historial"
+#: gajim/gui_menu_builder.py:681
+msgid "Synchronise History…"
+msgstr "Sincronizar historial…"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 msgid "Send Server Message…"
 msgstr "Enviar mensaje de servidor…"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 msgid "Set MOTD…"
 msgstr "Definir MOTD…"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr "Actualizar MOTD…"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 msgid "Delete MOTD…"
 msgstr "Eliminar MOTD…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 msgid "_Add Account…"
 msgstr "_Añadir cuenta…"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 msgid "_Modify Accounts…"
 msgstr "_Modificar cuentas…"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 msgid "_Modify Account…"
 msgstr "_Modificar cuenta…"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 msgid "Copy XMPP Address"
 msgstr "Copiar dirección XMPP"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
 msgstr "Unirse al grupo de charla"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-msgid "Add to Contact List…"
-msgstr "Añadir a la lista de contactos…"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
 msgstr "Copiar la dirección del enlace"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en navegador"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
 msgstr "Copiar dirección de correo electrónico"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 msgid "Open Email Composer"
 msgstr "Abrir el compositor de correo"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 msgid "Copy Location"
 msgstr "Copiar ubicación"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 msgid "Show Location"
 msgstr "Mostrar la ubicación"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 msgid "Copy XMPP Address/Email"
 msgstr "Copiar la dirección de correo/ID de Jabber"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 msgid "Invite"
 msgstr "Invitar"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr "Bloquear"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 msgid "Kick"
 msgstr "Expulsar"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 msgid "Ban"
 msgstr "Prohibir"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 msgid "Make Owner"
 msgstr "Hacer propietario"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 msgid "Make Admin"
 msgstr "Hacer administrador"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 msgid "Make Member"
 msgstr "Hacer miembro"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 msgid "Revoke Member"
 msgstr "Revocar Miembro"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr "Conceder voz"
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 msgid "Revoke Voice"
 msgstr "Revocar Voz"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 msgid "Copy"
 msgstr "Copiar"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Uso:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Opciones:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Mostrar este mensaje de ayuda y salir"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Elegir directorio para el fichero de traza"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "No se puede encontrar la base de datos del historial"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "%s no existe."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 msgid "XMPP Address"
 msgstr "Dirección XMPP"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Fecha"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -575,27 +576,27 @@ msgstr "Fecha"
 msgid "Nickname"
 msgstr "Alias"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensaje"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Limpieza de la base de datos"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 msgid "Clean up the database?"
 msgstr "¿Limpiar la base de datos?"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
@@ -605,177 +606,177 @@ msgstr ""
 "Normalmente el tamaño asignado a la base de datos no es liberado, "
 "simplemente vuelve a ser reutilizable. Esta operación puede tardar un poco."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 msgid "_Cleanup"
 msgstr "Limpieza"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Tú"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dijo: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Eliminar"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Borrar conversación"
 msgstr[1] "Borrar conversaciones"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "¿Quieres borrar permanentemente esta conversación con <b>%s</b>?"
 msgstr[1] "¿Quieres borrar permanentemente estas conversaciones?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Borrar mensaje"
 msgstr[1] "Borrar mensajes"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "¿Realmente quieres eliminar este mensaje?"
 msgstr[1] "¿Realmente quieres eliminar estos mensajes?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr "Dirección XMPP: <i>%s</i>"
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "General"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "En el grupo"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Definir estado de ánimo"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ninguno"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "¿Sobreescribir mensaje de estado?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Este nombre está en uso. ¿Quieres sobrescribir esta configuración?."
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr "Sobrescribir"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 msgid "Status Preset"
 msgstr "Estado predefinido"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 msgid "Save status as preset"
 msgstr "Guardar estado como predefinido"
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 msgid "Please assign a name to this status message preset"
 msgstr "Asigna un nombre a este mensaje de estado preestablecido"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 msgid "_Save"
 msgstr "_Guardar"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 msgid "New Status"
 msgstr "Nuevo estado"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nombre"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Esta cuentano está conectada al servidor"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "No puedes sincronizar con una cuenta hasta que no te hayas conectado."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "un audio con vídeo"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "un audio"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "un vídeo"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -784,85 +785,89 @@ msgstr ""
 "%(contact)s quiere comenzar una conversación de tipo %(type)s ¿Quieres "
 "contestar la llamada?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Enviar archivo…"
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Enviar archivo (max. %s MiB)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 msgid "No File Transfer available"
 msgstr "No hay transferencia de ficheros disponible"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 msgid "Invalid XMPP Address"
 msgstr "Dirección XMPP no válida"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, python-format
 msgid "Kick %s"
 msgstr "Expulsar a %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr "Prohibido %s"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 msgid "Voice Request"
 msgstr "Petición de voz"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
-msgstr "Petición de voz <b>%s</b> de <b>%s</b>"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
+msgstr "Petición de voz de <b>%(nick)s</b> desde <b>%(room_name)s</b>"
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr "_Aprobar"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s ha establecido el sujeto en %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr "El salón ahora muestra miembros no disponibles"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 msgid "Group chat now does not show unavailable members"
 msgstr "El salón ahora no muestra miembros no disponibles"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr "Se ha cambiado una configuración no relacionada con la privacidad"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 msgid "Conversations are stored on the server"
 msgstr "Las conversaciones están almacenadas en el servidor"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 msgid "Conversations are not stored on the server"
 msgstr "Las conversaciones no están almacenadas en el servidor"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 msgid "Group chat is now non-anonymous"
 msgstr "El salón es ahora no anónimo"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 msgid "Group chat is now semi-anonymous"
 msgstr "El salón es ahora semi-anónimo"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 msgid "Group chat is now fully anonymous"
 msgstr "El salón es ahora completamente anónimo"
 
@@ -876,7 +881,7 @@ msgstr "¿Ping? (%s)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "¡Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Error."
 
@@ -901,22 +906,22 @@ msgstr "Se ha creado un nuevo salón"
 msgid "Failed to Configure Group Chat"
 msgstr "Ha fallado la configuración del grupo de chat"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} es ahora conocido como {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Ahora eres {show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} es ahora {show}{status}"
@@ -969,14 +974,12 @@ msgid "You have been banned{actor}{reason}"
 msgstr "Has sido censurado{actor}{reason}"
 
 #: gajim/groupchat_control.py:1411 gajim/groupchat_control.py:1476
-#, fuzzy
 msgid ": Affiliation changed"
-msgstr "cambió la afiliación"
+msgstr ": Afiliación cambiada"
 
 #: gajim/groupchat_control.py:1417 gajim/groupchat_control.py:1481
-#, fuzzy
 msgid ": Group chat configuration changed to members-only"
-msgstr "la configuración del salón cambió a sólo miembros"
+msgstr ": la configuración del salón cambió a sólo miembros"
 
 #: gajim/groupchat_control.py:1445
 #, python-brace-format
@@ -1009,14 +1012,12 @@ msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
 #: gajim/groupchat_control.py:1520
-#, fuzzy
 msgid "Failed to Join Group Chat"
-msgstr "No se pudo entrar al grupo de charla"
+msgstr "Fallo al unirse a un grupo"
 
 #: gajim/groupchat_control.py:1526
-#, fuzzy
 msgid "Failed to Create Group Chat"
-msgstr "Abandonar grupos de charla"
+msgstr "La creación del grupo de chat ha fallado"
 
 #: gajim/groupchat_control.py:1542
 msgid "Group chat has been destroyed"
@@ -1040,52 +1041,52 @@ msgstr "¿Estás seguro de querer abandonar este grupo?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Si cierras esta ventana, abandonarás '%s'."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr "Abandonar"
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s ha sido invitado en esta sala"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Mostrar una lista de formateos"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Este contacto no soporta HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "¡Pong! (%s seconds)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
-msgstr ""
+msgstr "Estado %(type)s : %(state)s, motivo: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s del salón %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 "Nota: el historial de conversación está deshabilitado para este contacto."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr "Nota: El historial de chat está deshabilitado para esta cuenta."
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, python-format
 msgid ""
 "You just received a new message from %s.\n"
@@ -1094,26 +1095,26 @@ msgstr ""
 "Acabas de recibir un nuevo mensaje de %s.\n"
 "¿Quieres cerrar esta pestaña?"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 msgid "Close"
 msgstr "Cerrar"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1122,171 +1123,162 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s está ahora %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "Transferencia de archivo"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Tamaño"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "_Declinar"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 msgid "Open _Folder"
 msgstr "Abrir carpeta"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 msgid "Group Chat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "El contacto remoto detuvo la transferencia"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Error abriendo el archivo:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivo cancelada"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "La conexión con el cliente no se pudo establecer."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr "Mostrar la versión de la aplicación"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "Mostrar solo errores críticos"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr "Separar perfiles completamente (incluso historial y extensiones)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
-msgstr ""
+msgstr "Imprima estrofas XML y otra información de depuración"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Usar perfil definido en el directorio de configuración"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Establecer directorio de configuración"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Configuración del sistema de traza"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "Mostrar todas las advertencias"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "Abrir shell IPython"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Levanta una venana con el siguiente evento pendiente"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Iniciar nueva conversación"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "Simular pérdida de conectividad"
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "Simular recuperación de conectividad"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 msgid "Group chats"
 msgstr "Grupos de charla"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr "Autorización enviada"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Si \"%s\" acepta esta petición sabrás su estado."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
 msgstr "Autorización eliminada"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
@@ -1295,7 +1287,7 @@ msgstr "Ahora \"%s\" siempre te verá desconectado."
 msgid "desynced"
 msgstr "desincronizado"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr "Salir de Gajim"
 
@@ -1312,7 +1304,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Salir siempre al cerrar Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "Salir"
 
@@ -1454,8 +1447,8 @@ msgstr "¿Renombrar grupo %s?"
 msgid "Please enter a new name"
 msgstr "Por favor, entrar un nuevo nombre"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 msgid "_Rename"
 msgstr "_Renombrar"
 
@@ -1472,24 +1465,28 @@ msgstr "¿Quieres eliminar %s de la lista de contactos?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Eliminar del roster también a todos los contactos de este grupo grupo"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+msgid "Rename Group Chat"
+msgstr "Renombrar el grupo"
+
+#: gajim/roster_window.py:3045
 msgid "Please enter a new name for this group chat"
 msgstr "Por favor, escribe un nuevo nombre para este grupo"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 msgid "Remove contact from contact list"
 msgstr "Elimina contacto del roster"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Vas a eliminar a %(name)s (%(jid)s) de tu roster.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
@@ -1497,19 +1494,19 @@ msgstr ""
 "Al eliminar este contacto, también eliminas la autorización. Esto significa "
 "que te verá como desconectado."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr "Quiero que este contacto conozca mi estado después de la eliminación"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 msgid "Remove contacts from contact list"
 msgstr "Elimina contactos del roster"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1522,23 +1519,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 msgid "Remove Contacts"
 msgstr "Eliminar contactos"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debes crear una cuenta antes de poder conversar con otros contactos."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1546,11 +1543,11 @@ msgstr ""
 "Tu servidor no soporta almacenar información de metacontactos. Por tanto, "
 "esta información no se guardará para la próxima reconexión."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
 msgstr "Vas a crear un metacontacto"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
@@ -1560,117 +1557,117 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de XMPP o "
 "de transporte."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 msgid "Create Metacontact"
 msgstr "Crear metacontacto"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr "_Crear"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Enviar este archivo a %s:\n"
 msgstr[1] "Enviar estos archivos a %s:\n"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Enviar"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar de %(from)s a %(to)s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "Crear %s primer contacto"
 
-#: gajim/roster_window.py:4378
-#, fuzzy, python-format
+#: gajim/roster_window.py:4355
+#, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
-msgstr "Hacer %s y %s metacontactos"
+msgstr "Hacer metacontactos con %(contact1)s y %(contact2)s"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Publicar localización"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vitar a"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "Editar _grupos…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Reconectar"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "Ejecutar comando"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Histórico"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr "Los observadores pueden ver tu estado, pero tú no puedes ver los suyos"
 
@@ -1684,7 +1681,7 @@ msgstr "Confianza no decidida"
 
 #: gajim/conversation_textview.py:69
 msgid "Unverified"
-msgstr ""
+msgstr "No verificado"
 
 #: gajim/conversation_textview.py:72
 msgid "Verified"
@@ -1791,66 +1788,66 @@ msgstr "Conversaciones privadas"
 msgid "Messages"
 msgstr "Mensajes"
 
-#: gajim/gui_interface.py:161
-#, fuzzy, python-format
+#: gajim/gui_interface.py:162
+#, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorización HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "¿Aceptas esta petición (cuenta: %s)?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 msgid "Authorization Request"
 msgstr "Petición de autorización"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 msgid "HTTP Authorization Request"
 msgstr "Petición de autorización HTTP"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 msgid "_No"
 msgstr "_No"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Petición de adición"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 msgid "Subscription Removed"
 msgstr "Suscripción eliminada"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, python-format
-msgid "%s (%s) has removed subscription from you"
-msgstr "%s (%s) eliminó su suscripción de tí"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
+msgstr "%(name)s (%(jid)s) eliminó su suscripción de ti"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
@@ -1858,143 +1855,142 @@ msgstr ""
 "Siempre verás este contacto como desconectado.\n"
 "¿Quieres eliminarlo de tu lista de contactos?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Eliminado"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s ha declinado la invitación: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s ha declinado la invitación"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "{user} te ha invitado al grupo de charla {room}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "Frase de paso de certificada requerida"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Ingrese la frase de paso del certificado para la cuenta %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: gajim/gui_interface.py:694
-#, fuzzy
+#: gajim/gui_interface.py:669
 msgid "Remote Contact Stopped Transfer"
-msgstr "El contacto remoto detuvo la transferencia"
+msgstr "El contacto remoto ha detenido la transferencia"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 msgid "Error Opening File"
 msgstr "Error abriendo el archivo"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 msgid "SSL Certificate Error"
 msgstr "Error de certificado SSL"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Ha fallado al transferencia de fichero"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transferencia de %(filename)s recibida de %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transferencia de fichero %(filename)s desde %(name)s ha fallado."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transferencia de %(filename)s a %(name)s ha fallado."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 msgid "Please enter a new username for your local account"
 msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quiere empezar un chat de voz."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Petición de chat de voz"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 msgid "Insecure Connection"
 msgstr "Conexión insegura"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2005,19 +2001,19 @@ msgstr ""
 "insegura. Esto significa que las conversaciones no serán cifradas, y se "
 "desaconseja fuertemente. La conexión PLAIN está totalmente desaconsejada."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 msgid "_Connect Anyway"
 msgstr "_Conectar de todos modos"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr "Gajim: consola IPython"
 
@@ -2033,9 +2029,9 @@ msgid "Unread Events"
 msgstr "Eventos sin leer"
 
 #: gajim/dialog_messages.py:43
-#, fuzzy
 msgid "Read or acknowledge all pending events before removing this account."
-msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
+msgstr ""
+"Leer o reconocer todos los eventos pendientes antes de eliminar esta cuenta."
 
 #: gajim/dialog_messages.py:48
 msgid "Invalid Form"
@@ -2077,9 +2073,8 @@ msgstr ""
 "%(error)s"
 
 #: gajim/dialog_messages.py:70
-#, fuzzy
 msgid "Wrong Custom Hostname"
-msgstr "Usar nombre de host y puerto personalizados"
+msgstr "Nombre personalizado de host incorrecto"
 
 #: gajim/dialog_messages.py:71
 #, python-format
@@ -2164,9 +2159,9 @@ msgstr ""
 "La mensajería de enlace local podría no funcionar correctamente."
 
 #: gajim/dialog_messages.py:113
-#, fuzzy
 msgid "Could not request upload slot for HTTP File Upload"
-msgstr "No se pudo iniciar servicio local"
+msgstr ""
+"No se pudo solicitar el espacio de carga para la carga de archivos HTTP"
 
 #: gajim/dialog_messages.py:118 gajim/dialog_messages.py:123
 msgid "Could not Open File"
@@ -2174,16 +2169,15 @@ msgstr "No se pudo abrir el fichero"
 
 #: gajim/dialog_messages.py:119
 msgid "Exception raised while trying to open file (see log)."
-msgstr ""
+msgstr "Excepción al intentar abrir el fichero (ver traza)."
 
 #: gajim/dialog_messages.py:128
 msgid "Not Secure"
 msgstr "No seguro"
 
 #: gajim/dialog_messages.py:129
-#, fuzzy
 msgid "The server returned an insecure transport (HTTP)."
-msgstr "El servicio devolvió un error"
+msgstr "El servicio devolvió un transporte inseguro (HTTP)."
 
 #: gajim/dialog_messages.py:133
 msgid "Could not Upload File"
@@ -2192,11 +2186,11 @@ msgstr "No se pudo cargar el fichero"
 #: gajim/dialog_messages.py:134
 #, python-format
 msgid "HTTP response code from server: %s"
-msgstr ""
+msgstr "Código de respuesta HTTP desde el servidor: %s"
 
 #: gajim/dialog_messages.py:138
 msgid "Upload Error"
-msgstr ""
+msgstr "Error al cargar"
 
 #: gajim/dialog_messages.py:143
 msgid "Encryption Error"
@@ -2207,15 +2201,14 @@ msgid "There is no encryption method available for the chosen encryption."
 msgstr "No hay método de cifrado disponible para el cifrado elegido."
 
 #: gajim/dialog_messages.py:149
-#, fuzzy
 msgid "Avatar Upload Failed"
-msgstr "falló la publicación de la vCard"
+msgstr "La subida del avatar falló"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2238,11 +2231,8 @@ msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
 #: gajim/gajim_remote.py:85
-#, fuzzy
 msgid "Lists all contacts in the contact list, one for each line"
-msgstr ""
-"Muestra una lista de todos los contactos en el roster. Cada contacto aparece "
-"en una línea separada"
+msgstr "Muestra una lista de todos los contactos en el roster, uno por línea"
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
 #: gajim/gajim_remote.py:122 gajim/gajim_remote.py:133
@@ -2269,13 +2259,12 @@ msgid "?CLI:status"
 msgstr "?CLI:estado"
 
 #: gajim/gajim_remote.py:100
-#, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd. If not set, use account's "
 "previous status"
 msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
-"ocupado, invisible"
+"no molestar. Si no se establece, se usa el estado previo de la cuenta"
 
 #: gajim/gajim_remote.py:101 gajim/gajim_remote.py:121
 #: gajim/gajim_remote.py:132 gajim/gajim_remote.py:141
@@ -2308,20 +2297,18 @@ msgid "priority you want to give to the account"
 msgstr "prioridad que quieres dar a la cuenta"
 
 #: gajim/gajim_remote.py:112
-#, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
-"cambia el estado de la cuenta \"account\". Si no se especifica, prueba a "
-"cambiar el estado de todas las cuentas que tienen la opción \"sync with "
-"global status\" activada"
+"cambiar la prioridad de la cuenta dada. Si no se especifica, cambia el "
+"estado de todas las cuentas que tengan establecida la opción \"sync with "
+"global status\""
 
 #: gajim/gajim_remote.py:118
-#, fuzzy
 msgid ""
 "Sends new chat message to a contact in the contact list. Account is optional."
-msgstr "Enviar un mensaje al contacto"
+msgstr "Enviar un mensaje a un contacto de la lista. La cuenta es opcional."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
 msgid "XMPP Address of the contact that will receive the message"
@@ -2338,10 +2325,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "si es especificado el mensaje será enviado a través de esta cuenta"
 
 #: gajim/gajim_remote.py:127
-#, fuzzy
 msgid ""
 "Sends a chat message to someone on your contact list. Account is optional."
-msgstr "Enviar un mensaje al contacto"
+msgstr ""
+"Enviar un mensaje a alguien de la lista de contactos. La cuenta es opcional."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2352,9 +2339,8 @@ msgid "message subject"
 msgstr "tema del mensaje"
 
 #: gajim/gajim_remote.py:138
-#, fuzzy
 msgid "Sends new message to a group chat you've joined."
-msgstr "Envía un nuevo mensaje a un grupo de charla al que hayas entrado"
+msgstr "Envía un nuevo mensaje a un grupo de charla al que te has unido."
 
 #: gajim/gajim_remote.py:140
 msgid "XMPP Address of the group chat that will receive the message"
@@ -2406,10 +2392,8 @@ msgid "key=value"
 msgstr "entrada=valor"
 
 #: gajim/gajim_remote.py:174
-#, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
-msgstr ""
-"'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
+msgstr "'clave' es el nombre de la preferencia, 'valor' es el valor a definir"
 
 #: gajim/gajim_remote.py:179
 msgid "Deletes a preference item"
@@ -2461,13 +2445,12 @@ msgid "XML to send"
 msgstr "XML a enviar"
 
 #: gajim/gajim_remote.py:222
-#, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
-"Cuenta a la que el xml será enviado; si no se especifica nada, el xml será "
-"enviado a todas las cuentas"
+"Cuenta a la que se enviará el XML; si no se especifica, el XML será enviado "
+"a todas las cuentas"
 
 #: gajim/gajim_remote.py:229
 msgid "Check if Gajim is running"
@@ -2543,116 +2526,106 @@ msgstr ""
 "No se especificó el argumento \"%(arg)s\". \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s es un directorio pero podría ser un archivo"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, python-format
 msgid "Creating %s"
 msgstr "Creando %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Error SSL desconocido: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Nuevo mensaje de %(nickname)s"
 msgstr[1] "%(n_msgs)i mensajes sin leer de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 msgid "New Group Chat Message"
 msgstr "Nuevo mensaje de grupo de chat"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambió su estado"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está ahora %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se ha conectado"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se ha desconectado"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 msgid "Authentication failed"
 msgstr "Falló la autentificación"
 
 #: gajim/common/config.py:76
-#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
 "and does not have focus."
 msgstr ""
-"Permitir notificaciones emergentes cuando estoy _ausente, no disponible, "
-"ocupado o invisible."
+"Mostrar notificación de escritorio incluso cuando una ventana de chat está "
+"abierta para este contacto y no tiene el foco."
 
 #: gajim/common/config.py:77
 msgid "Play sound even when being busy."
 msgstr "Reproducir sonido cuando esté ocupado."
 
 #: gajim/common/config.py:79
-#, fuzzy
 msgid "Show only online and free for chat contacts in the contact list."
-msgstr ""
-"Mostrar en el roster sólamente los contactos en línea o libres para hablar"
+msgstr "Mostrar solo los contactos en línea o libres para hablar."
 
 #: gajim/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tiempo en minutos, después de haber cambiado a ausente"
 
 #: gajim/common/config.py:83
-#, fuzzy
 msgid "$S (Away: Idle more than $T min)"
-msgstr "$S (Ausente por estar inactivo más de $T minutos)"
+msgstr "$S (Ausente: inactivo más de $T minutos)"
 
 #: gajim/common/config.py:83
-#, fuzzy
 msgid ""
 "$S will be replaced by current status message, $T by the 'autoawaytime' "
 "value."
 msgstr ""
 "$S será reemplazado por el mensaje de estado actual, $T por tiempo de auto-"
-"ausencia"
+"ausencia."
 
 #: gajim/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
@@ -2663,85 +2636,46 @@ msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (No disponible: inactivo más de $T minutos)"
 
 #: gajim/common/config.py:86
-#, fuzzy
 msgid ""
 "$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S será reemplazado por el actual mensaje de estado, $T por tiempo de auto-"
-"ausencia extendida"
+"ausencia extendida."
 
 #: gajim/common/config.py:89
-#, fuzzy
 msgid ""
 "When to show the notification area icon. Can be 'never', 'on_event', and "
 "'always'."
 msgstr ""
-"Cuándo mostrar el icono systray. Puede ser 'nunca', 'en eventos', 'siempre'."
+"Cuándo mostrar el icono en área de notificación. Puede ser 'never', "
+"'on_event', 'always'."
 
 #: gajim/common/config.py:90
 msgid ""
 "Allow to hide the contact list window even if the notification area icon is "
 "not shown."
 msgstr ""
-
-#: gajim/common/config.py:93
-#, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Notif_icarme de los contactos que se conecten"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Notificar cuand un contacto: "
-
-#: gajim/common/config.py:95
-msgid "Notification color for new message notification."
-msgstr "Color de la notificación para notificación de nuevo mensaje."
-
-#: gajim/common/config.py:96
-msgid "Notification color for file transfer request."
-msgstr "Color de la notificación de petición de transferencia de fichero."
-
-#: gajim/common/config.py:97
-msgid "Notification color for file transfer errors."
-msgstr "Color de notificación de errores en transferencia de fichero."
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-"Color de notificación para transferencia de ficheros terminadas o detenidas."
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr "Color de notificación para invitaciones a grupos."
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Color de fondo para los contactos que acaban de conectar."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr "Color de notificación para otros diálogos."
+"Permitir ocultar la ventana de la lista de contactos incluso si no se "
+"muestra el icono del área de notificación."
 
 # duda sobre collapsed
-#: gajim/common/config.py:102
-#, fuzzy
+#: gajim/common/config.py:93
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
-"Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
+"Lista de filas (cuentas y grupos) que están contraídas (separadas por "
+"espacios)."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "por defecto"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr "Idioma usado por el corrector."
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2751,55 +2685,53 @@ msgstr ""
 "'a veces' - muestra la hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca muestra la hora."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 "Cuando esté habilitado, los emoticonos ASCII serán convertidos en emoticonos "
 "gráficos."
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar los pares de * / _ como posibles caracteres de formateo."
 
-#: gajim/common/config.py:115
-#, fuzzy
+#: gajim/common/config.py:106
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
 msgstr ""
-"Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
-"* *"
+"Si está habilitado, no elimina */_ . Entonces *abc* será negrita, pero sin "
+"eliminar * *."
 
-#: gajim/common/config.py:118
-#, fuzzy
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr ""
-"Carácter a añadir tras el alias cuando se usa completado de alias (tab) en "
-"los grupos de charla."
+"Carácter a añadir después del apodo cuando se usa el completado de apodos "
+"(tab) en salas de chat."
 
-#: gajim/common/config.py:119
-#, fuzzy
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr ""
-"Carácter a proponer para añadir tras el alias deseado cuando el alias "
-"deseado está siendo usado por alguien en el grupo de charla."
+"Carácter a proponer para añadir tras el alias deseado cuando el alias ya "
+"está siendo usado por alguien en el grupo."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
+"Si está habilitado, Gajim guardará la posición de la ventana de la lista de "
+"contactos cuando la oculte, y la restaurará cuando la vuelva a mostrar."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
-msgstr ""
+msgstr "Coloque la lista de contactos a la derecha en modo de ventana única"
 
-#: gajim/common/config.py:153
-#, fuzzy
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -2807,26 +2739,25 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 "Esta opción te permite personalizar la marca horaria de las conversaciones. "
-"Por ejemplo \"[%H:%M] \" mostrará \"[hour:minute] \". Mira la documentación "
-"de Python acerca de strftime y para más detalles: http://docs.python.org/lib/"
-"module-time.html"
+"Por ejemplo [%H:%M] mostrará '[hora:minuto]'. Mira la documentación de "
+"Python acerca de strftime y para más detalles (https://docs.python.org/3/"
+"library/time.html#time.strftime)."
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Caracteres que se imprimen antes del alias en las conversaciones."
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Caracteres que se imprimen después del alias en las conversaciones."
 
-#: gajim/common/config.py:156
-#, fuzzy
+#: gajim/common/config.py:147
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
-"Si está marcado, Gajim mostrará el estado de ánimo de los contactos en el "
-"roster"
+"Si está habilitado, Gajim agregará * y [n] en el título de la ventana de la "
+"lista de contactos."
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
@@ -2834,106 +2765,103 @@ msgstr ""
 "Cuántos mensajes a recuperar del historial se vuelve a abrir una pestaña/"
 "ventana de conversación."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
+"Cuantos minutos hacia atrás serán restaurados del historial de chat. -1 "
+"significa que no hay límite."
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
+"Cuántos segundos esperar antes de intentar unirse automáticamente a un chat "
+"grupal del que te desconectaste. Establezca en 0 para deshabilitar la "
+"reincorporación automática."
 
-#: gajim/common/config.py:160
-#, fuzzy
+#: gajim/common/config.py:151
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
-msgstr ""
-"Envía un mensaje con Ctrl+Intro y con Intro hace un nuevo renglón (Al estilo "
-"del cliente Mirabilis ICQ)"
+msgstr "Envía mensaje con Ctrl+Intro y con Intro hace un nuevo renglón."
 
-#: gajim/common/config.py:162
-#, fuzzy
+#: gajim/common/config.py:153
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
-msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
+msgstr ""
+"Cuántas líneas almacenar para Ctrl+Arriba (mensajes enviados previamente)."
 
-#: gajim/common/config.py:165
-#, fuzzy, python-format
+#: gajim/common/config.py:156
+#, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
 "'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
-"URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
-"significa usar wiktionary"
+"Ya sea una URL personalizada con %%s (donde %%s es la palabra/frase) o "
+"'WIKTIONARY' (que significa usar Wikitionary)."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si está marcado, Gajim puede ser controlado remotamente usando gajim-remote."
 
-#: gajim/common/config.py:169
-#, fuzzy
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
-"Cuando no se muestra la hora en cada mensaje (print_time==sometimes), la "
-"muestra cada x minutos."
+"Cuando no imprimir la hora para cada mensaje ('print_time'==a veces), imprir "
+"cada x minutos."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr "Preguntar antes de pegar una imagen"
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: gajim/common/config.py:172
-#, fuzzy
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
-"Preguntar antes de cerrar una ventana de conversación con pestañas si hay un "
-"control que pueda perder datos (conversaciones, grupos de conversación que "
-"no están minimizados)"
+"Preguntar antes de cerrar la ventana de chat con pestañas si hay chats que "
+"pueden perder datos (chat, chat privado, chat grupal que no se minimizarán)."
 
-#: gajim/common/config.py:175
-#, fuzzy
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
 msgstr ""
-"Lista de hosts que enviamos separados por comas, además de las interfaces "
-"locales, para las transferencias de archivos en caso redirección de puerto o "
-"interpretación de la dirección."
+"Lista de hosts de envío (separados por comas) además de interfaces locales "
+"para transferencias de archivos (en caso de traducción de direcciones/"
+"reenvío de puertos)."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Según el estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Notificar eventos en el área de notificación."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "¿Mostrar borde solapado de archivador en las ventanas de conversación?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "¿Previsualizar nuevos mensajes en un mensaje emergente?"
 
-#: gajim/common/config.py:201
-#, fuzzy
+#: gajim/common/config.py:180
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
@@ -2941,57 +2869,47 @@ msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en los grupos "
 "de charla."
 
-#: gajim/common/config.py:202
-#, fuzzy
+#: gajim/common/config.py:181
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
 "This setting is taken into account only if the notification area icon is "
 "used."
 msgstr ""
-"Si es True, cierra Gajim cuando el botón X del gestor de ventanas es "
-"pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
-"notificación. "
+"Si está habilitado, Gajim se cierra al hacer clic en el botón X de tu "
+"Administrador de ventanas. Esta configuración solo se tiene en cuenta si se "
+"utiliza el icono del área de notificación."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
+"Si está habilitado, Gajim oculta la ventana de la lista de contactos al "
+"presionar el botón X en lugar de minimizar en el área de notificación."
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
-"sin leer. Dependiendo del tema, este icono puede ser animado."
-
-#: gajim/common/config.py:205
-#, fuzzy
+#: gajim/common/config.py:183
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
 "the contact name in the contact list window."
 msgstr ""
-"Si es True, Gajim mostrará el mensaje de estado, si no está vacío, para cada "
-"contacto bajo su nombre de contacto en ela ventana del roster."
+"Si está habilitado, Gajim mostrará el mensaje de estado (si no está vacío) "
+"debajo del nombre del contacto en la ventana de la lista de contactos."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Definir la posición del avatar en el roster. Puede ser izquierda o derecha."
 
-#: gajim/common/config.py:212
-#, fuzzy
+#: gajim/common/config.py:190
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
 "contact changes their status (and/or their status message)."
 msgstr ""
-"Si es False, Gajim nunca más mostrará la línea de estado cuando un contacto "
-"cambie su estado o su mensaje de estado"
+"Si está deshabilitado, Gajim no mostrará más el mensaje de estado cuando un "
+"contacto cambie su estado (y/o su mensaje de estado)."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
@@ -2999,29 +2917,28 @@ msgstr ""
 "Por defecto: Mostrar mensaje de estado por cada uno que se una o se vaya del "
 "grupo."
 
-#: gajim/common/config.py:214
-#, fuzzy
+#: gajim/common/config.py:192
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
-msgstr "No se pudo entrar al grupo de charla"
+msgstr ""
+"Configuración predeterminada: muestra un mensaje de estado para todos los "
+"cambios de estado (ausente, no molestar, etc.) de los usuarios en un grupo."
 
-#: gajim/common/config.py:216
-#, fuzzy
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
 msgstr "No mostrar roster en la barra de tareas."
 
-#: gajim/common/config.py:217
-#, fuzzy
+#: gajim/common/config.py:195
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
 "Window Managers) when holding pending events."
 msgstr ""
-"Si es True y las versiones instaladas de GTK+ y PyGTK son al menos 2.8, hace "
-"a la ventana resaltarse cuando se tienen eventos pendientes."
+"Si está habilitado, Gajim hace que la ventana parpadee (el comportamiento "
+"predeterminado en la mayoría de los administradores de ventanas) cuando se "
+"mantienen eventos pendientes."
 
-#: gajim/common/config.py:221
-#, fuzzy
+#: gajim/common/config.py:199
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3039,10 +2956,9 @@ msgstr ""
 "'never' - Todos los mensajes tienen su propia ventana\n"
 "'peracct' - Los mensajes de cada cuenta se envían a una ventana específica.\n"
 "'pertype' - Cada tipo de mensaje (p.ej. conversaciones vs. grupos de charla) "
-"se envian a una ventana específica."
+"se envían a una ventana específica."
 
-#: gajim/common/config.py:222
-#, fuzzy
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3054,34 +2970,30 @@ msgstr ""
 "'never' - No mostrar nunca la lista.\n"
 "'last_state' - Restaurar el último estado de la lista."
 
-#: gajim/common/config.py:223
-#, fuzzy
+#: gajim/common/config.py:201
 msgid "If enabled, Gajim displays the avatar in the chat window."
-msgstr "Si es False, no verás más el avatar en la ventana de conversación."
+msgstr ""
+"Si está habilitado, Gajm mostrará el avatar en la ventana de conversación."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Si está habilitado, al presionar la tecla escape se cierra una ventana/"
 "pestaña."
 
-#: gajim/common/config.py:225
-#, fuzzy
+#: gajim/common/config.py:203
 msgid "Hides the banner in a group chat window."
-msgstr "Oculta el banner en una ventana de grupo de charla"
+msgstr "Oculta el banner en una ventana de grupo de charla."
 
-#: gajim/common/config.py:226
-#, fuzzy
+#: gajim/common/config.py:204
 msgid "Hides the banner in a 1:1 chat window."
-msgstr "Oculta el banner en una ventana de grupo de charla"
+msgstr "Oculta el banner en una ventana de charla 1 a 1."
 
-#: gajim/common/config.py:227
-#, fuzzy
+#: gajim/common/config.py:205
 msgid "Hides the group chat participants list in a group chat window."
-msgstr "Oculta los ocupantes en las ventans de grupo de charla."
+msgstr "Oculta la lista de participantes en la ventana de grupo de charla."
 
-#: gajim/common/config.py:228
-#, fuzzy
+#: gajim/common/config.py:206
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking as in the previous message."
@@ -3089,71 +3001,65 @@ msgstr ""
 "En una conversación, muestra el alias al principio de una línea sólo cuando "
 "no es la misma persona que envió el último mensaje."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentar cuando se use una combinación de alias consecutivos."
 
-#: gajim/common/config.py:230
-#, fuzzy
+#: gajim/common/config.py:208
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr ""
-"Ctrl-Tab conduce a la próxima pestaña de composición cuando ninguno está sin "
-"leer."
+"Ctrl+Tab cambia a la siguiente pestaña de composición cuando no hay pestañas "
+"con mensajes pendientes."
 
-#: gajim/common/config.py:231
-#, fuzzy
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
-"¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
-"secuencia vacía significa que nunca se mostrará."
+"¿Mostrar un diálogo de confirmación para crear metacontactos? Vacío "
+"significa que nunca se mostrará el cuadro de diálogo."
 
-#: gajim/common/config.py:232
-#, fuzzy
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
-"¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
-"secuencia vacía significa que nunca se mostrará."
+"¿Mostrar diálogo de confirmación de bloqueo de contacto? Una cadena vacía "
+"significa que nunca se mostrará."
 
-#: gajim/common/config.py:233
-#, fuzzy
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
-"Si es True, te será posible definir una prioridad negativa a tu cuenta en la "
-"ventana de modificación de cuenta. TEN CUIDADO, cuando estás conectado con "
-"una prioridad negativa, NO recibirás ningún mensaje de tu servidor."
+"Si está habilitado, podrás establecer una prioridad negativa para tu cuenta "
+"en la ventana Cuentas. TEN CUIDADO, cuando inicies sesión con una prioridad "
+"negativa, NO recibirás ningún mensaje de tu servidor."
 
-#: gajim/common/config.py:234
-#, fuzzy
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
-"Si es True, Gajim mostrará el número de contactos totales y en línea en los "
-"títulos de la cuenta y los grupos."
+"Si está habilitado, Gajim mostrará tanto el número de contactos en línea "
+"como los totales en las filas de la cuenta, así como en las filas del grupo."
 
-#: gajim/common/config.py:235
-#, fuzzy
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
-"Si es True, Gajim mostrará y seleccionará el contacto que te envió el último "
-"mensaje, si la ventana de conversación no ha sido abierta aún."
+"Si está habilitado, Gajim se desplazará y seleccionará el contacto que te "
+"envió el último mensaje, si la ventana de chat aún no está abierta."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tiempo de inactividad necesario antes de cerrar la ventana de estado."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3161,1508 +3067,1514 @@ msgstr ""
 "Número máximo de líneas mostradas en las conversaciones. Las más antiguas "
 "serán limpiadas."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Elige intervalo entre 2 comprobaciones de inactividad."
-
-#: gajim/common/config.py:239
-#, fuzzy
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
-"Combinaciones de uri válidas. Sólo las combinaciones de esta lista serán "
-"aceptadas como uri \"real\"."
+"Esquemas válidos de URI. Solo los esquemas en esta lista serán aceptados "
+"como URI 'real' (mailto y xmpp se manejan por separado)."
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
+"Si está habilitado, el completado en grupos será como en el autocompletado "
+"de shell."
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
+"Opcionalmente arregla la velocidad de fotogramas de salid de video de "
+"Jingle. Ejemplo: 10/1 o 25/2."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
+"Opcionalmente, cambia el tamaño del video de salida Jingle. Ejemplo: 320x240."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
+"Si está habilitado, también verás la transmisión de video de tu cámara web."
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
+"Si está habilitado, Gajim intentará usar un servidor STUN cuando use Jingle. "
+"El que está en la opción 'stun_server', o el dado por el servidor XMPP."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr "Servidor STUN cuando se use Jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
+"Si está habilitado, Gajim mostrará la afiliación de los participantes del "
+"grupo agregando un cuadrado de color al ícono de estado."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
+"Proxy utilizado para todas las conexiones salientes si la cuenta no tiene un "
+"proxy específico configurado."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
+"Si está habilitado, Gajim ignorará las solicitudes de atención entrantes "
+"('wizz')."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
+"Si está habilitado, Gajim volverá a abrir las ventanas de chat que se "
+"abrieron la última vez que se cerró Gajim."
 
-#: gajim/common/config.py:255
-#, fuzzy
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
-"Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
-"mensaje por defecto especificado."
-
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
+"Si está habilitado, Gajim mostrará un icono para indicar que los mensajes "
+"envidados han sido recibido por tu contacto."
 
-#: gajim/common/config.py:257
-#, fuzzy
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
-"Si es True, Gajim usará Gnome Keyring (si está disponible) para almacenar "
-"las contraseñas de la cuenta."
+"Si está habilitado, Gajim usará el llavero del sistema para almacenar las "
+"contraseñas de las cuentas."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
-msgstr ""
+msgstr "Si está habilitado, Gajim ejecutará comandos XEP-0146."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2:Sistema, 1:Habilitado, 0:Deshabilitado"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
+"Opciones en días que se pueden elegir en el menú de umbral de sincronización"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
+"Máximo historial en días que pedimos al archivo de un grupo público. 0: "
+"Tanto como sea posible."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
+"Máximo historial en días que pedimos al archivo de un grupo privado. 0: "
+"Tanto como sea posible."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
+"Si está habilitado, Gajim muestra el asunto del grupo en la ventana de chat "
+"al unirse."
 
-#: gajim/common/config.py:264
-#, fuzzy
+#: gajim/common/config.py:240
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr ""
-"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
-"estás usando"
+"Si está habilitado, la fila del contacto se colorea de acuerdo con el estado "
+"de chat actual del mismo."
 
-#: gajim/common/config.py:265
-#, fuzzy
+#: gajim/common/config.py:241
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr ""
-"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
-"estás usando"
+"Si está habilitado, la pestaña se colorea de acuerdo con el estado de chat "
+"actual del contacto."
 
-#: gajim/common/config.py:266
-#, fuzzy
+#: gajim/common/config.py:242
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr ""
-"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
-"estás usando"
+"Muestra un texto en el banner que describe el estado actual del chat del "
+"contacto."
 
-#: gajim/common/config.py:267
-#, fuzzy
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
-"Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
+"Notificaciones de estado enviadas a los contactos. Valores posibles: all, "
+"composing_only o disabled."
 
-#: gajim/common/config.py:268
-#, fuzzy
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr ""
-"Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
+"Notificaciones de estado enviadas al grupo. Valores posibles: 'all', "
+"'composing_only' o 'disabled'."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
-msgstr ""
+msgstr "Preferencias de API. Valores posibles: 'http', 'iq'"
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
-msgstr ""
+msgstr "Seleccionar texto lo copiará al portapapeles"
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
+"Si está habilitado, Gajim ejecutará comandos (/show, /sh, /execute, /exec)."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
-msgstr ""
+msgstr "Ancho del roster de un grupo en pixels"
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 msgid "Force Bookmark 2 usage"
 msgstr "Fuerza el uso del formato Bookmark 2"
 
-#: gajim/common/config.py:291
-#, fuzzy
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+"Muestra una barra de información con consejos útiles en el cuadro de diálogo "
+"Iniciar / Unirse al chat"
+
+#: gajim/common/config.py:269
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr ""
-"La prioridad cambiará automáticamente acorde a tu estado. Las prioridades "
-"están definidas en las opciones de autoprioridad_*"
+"La prioridad cambiará automáticamente según tu estado. Las prioridades se "
+"definen en las opciones 'autopriority_ *'."
 
-#: gajim/common/config.py:298
-#, fuzzy
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
-"Estado usado para las autoconexiones. Puede ser online, chat, away, xa, dnd, "
-"invisible. NOTA: esta opción se usa sólo si restore_last_status está "
-"desactivado"
+"Estado que se utilizará automáticamente al conectarse. Puede ser 'en línea', "
+"'chat', 'ausente', 'ocupado' o 'no molestar'. NOTA: Esta opción se usa solo "
+"si 'restore_last_status' está deshabilitado."
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr "Si está activado, se restaurará el último estado."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
+"Si está habilitado, los contactos pidiendo autorización serán aceptados "
+"automáticamente."
 
-#: gajim/common/config.py:301
-#, fuzzy
+#: gajim/common/config.py:279
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
-msgstr "Si es False, no verás más el avatar en la ventana de conversación."
+msgstr ""
+"Si está deshabilitado, esta cuenta será deshabilitada y no parecerá en la "
+"ventana de la lista de contactos."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 msgid "Use an unencrypted connection to the server"
 msgstr "Usar una conexión al servidor no cifrada"
 
-#: gajim/common/config.py:306
-#, fuzzy
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
-"texto plano."
+"texto plano. Puede ser 'warn', o 'none'."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
-msgstr ""
+msgstr "Lista de errores SSL a ignorar (separados por espacios)."
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
-msgstr ""
+msgstr "ConnectionType: START TLS, DIRECT TLS o PLAIN"
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
+"Lista de direcciones XMPP (separadas por espacios) para las que no deseas "
+"almacenar el historial de chat. También puedes agregar el nombre de una "
+"cuenta para deshabilitar el almacenamiento del historial de chat para la "
+"misma."
 
-#: gajim/common/config.py:315
-#, fuzzy
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 "Cuántos segundos esperar una respuesta de paquetes de mantenimiento de "
-"actividad antes de  intentar reconectar."
+"actividad antes de intentar reconectar."
 
-#: gajim/common/config.py:319
-#, fuzzy
+#: gajim/common/config.py:297
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
 "'file_transfer_proxies' option for file transfers."
 msgstr ""
-"Si está marcado, Gajim usará tu IP y proxies definidos en la opción "
-"file_transfer_proxies para tu transferencia."
+"Si está habilitado, Gajim usará tu IP y los proxies definidos en la opción "
+"'file_transfer_proxies' para las transferencias de ficheros."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
+"Si está habilitado, Gajim probará los proxies de transferencia de archivos "
+"al inicio para asegurarse de que funcionen. Se sabe que los proxys de "
+"Openfire fallan en esta prueba incluso si funcionan."
 
-#: gajim/common/config.py:332
-#, fuzzy
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
-"Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
-"mensaje por defecto especificado."
+"Si está habilitado, Gajim responderá a las solicitudes de recepción de "
+"mensajes."
 
-#: gajim/common/config.py:341
-#, fuzzy
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
-"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
-"estás usando"
+"Permitir a Gajim enviar información del sistema operativo que estás usando."
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Permita que Gajim envíe su hora local."
 
-#: gajim/common/config.py:345
-#, fuzzy
+#: gajim/common/config.py:323
 msgid "Message that is sent to contacts you want to add."
-msgstr "Por favor, rellena la información del contacto que quieres añadir"
+msgstr "Mensaje que se envía a los contactos que quieres añadir."
 
-#: gajim/common/config.py:346
-#, fuzzy
+#: gajim/common/config.py:324
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
 "your machine for file transfers."
 msgstr ""
-"Si está marcado, Gajim usará tu IP y proxies definidos en la opción "
-"file_transfer_proxies para tu transferencia."
+"Si está habilitado, Gajim enviará tu IP local para que tu contacto pueda "
+"conectarse a tu máquina para transferencias de ficheros."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
+"Lista de direcciones XMPP (separadas por espacios) para las cuales la "
+"ventana de chat se volverá a abrir en el próximo inicio."
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
+"Mecanismo preferido de transferencia de archivos para arrastrar&soltar en "
+"una ventana de chat. Puede ser 'httpupload' (por defecto) o 'jingle'."
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr "Permitir verificación de certificado con POSH."
 
-#: gajim/common/config.py:379
-#, fuzzy
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr ""
-"Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
+"Notificaciones de estado enviadas a los contactos. Valores posibles: 'all', "
+"'composing_only' o 'disabled'."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 msgid "The currently active encryption for that contact."
 msgstr "Cifrado actual activo para ese contacto."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
+"Si está habilitado, se crea una notificación para cada mensaje en este grupo."
 
-#: gajim/common/config.py:387
-#, fuzzy
+#: gajim/common/config.py:364
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
-msgstr "No se pudo entrar al grupo de charla"
+msgstr ""
+"Muestra un mensaje de estado para todos los cambios de estado (ausente, no "
+"molestar, etc.) de los usuarios en un grupo."
 
-#: gajim/common/config.py:388
-#, fuzzy
+#: gajim/common/config.py:365
 msgid "Show a status message for every join or leave in a group chat."
-msgstr "No se pudo entrar al grupo de charla"
+msgstr ""
+"Mostrar un mensaje de estado por cada unión o abandono en un grupo de chat."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
+"Si está habilitado, el grupo se minimiza en la lista de contactos al unirse "
+"automáticamente."
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
+"Si está habilitado, el grupo se minimiza en la lista de contactos al "
+"cerrarlo."
 
-#: gajim/common/config.py:391
-#, fuzzy
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr ""
-"Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
+"Notificaciones de estado enviadas al grupo. Posibles valores: 'all', "
+"'composing_only' o 'disabled'."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
+"Si está habilitado, los complementos se activarán al inicio (esto se guarda "
+"al salir de Gajim). Esta opción NO DEBE usarse para (des)activar "
+"complementos. Utilice la ventana del complemento en su lugar."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Comiendo"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 msgid "I'm eating."
 msgstr "Estoy comiendo."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Película"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Trabajando"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Teléfono"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Fuera"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: gajim/common/config.py:431
-#, fuzzy
+#: gajim/common/config.py:408
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "'muc_highlight_words' or your nickname is mentioned."
 msgstr ""
 "Sonido a reproducir cuando un mensaje de grupo de charla contiene una de las "
-"palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
-"contiene tu alias."
+"palabras de 'muc_highlight_words', o cuando se menciona tu alias."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 msgid "Sound to play when any group chat message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje a grupos de chat."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: gajim/common/const.py:247
-#, fuzzy
+#: gajim/common/const.py:280
 msgid "?Group chat name:Team"
-msgstr "Ninguno"
+msgstr "?Group chat name:Equipo"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
-msgstr ""
+msgstr "?Group chat description:Discusión de proyecto"
 
-#: gajim/common/const.py:249
-#, fuzzy
+#: gajim/common/const.py:282
 msgid "?Group chat address:team"
-msgstr "Grupos de charla"
+msgstr "?Group chat address:equipo"
 
-#: gajim/common/const.py:250
-#, fuzzy
+#: gajim/common/const.py:283
 msgid "?Group chat name:Family"
-msgstr "Resaltado de mensaje de grupo de charla"
+msgstr "?Group chat name:Familia"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
-msgstr ""
+msgstr "?Group chat description:Reunión primaveral"
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
-msgstr ""
+msgstr "?Group chat address:familia"
 
-#: gajim/common/const.py:253
-#, fuzzy
+#: gajim/common/const.py:286
 msgid "?Group chat name:Vacation"
-msgstr "Invitación a grupo de charla"
+msgstr "?Group chat name:Vacaciones"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
-msgstr ""
+msgstr "?Group chat description:Planificación de viaje"
 
-#: gajim/common/const.py:255
-#, fuzzy
+#: gajim/common/const.py:288
 msgid "?Group chat address:vacation"
-msgstr "Invitación a grupo de charla"
+msgstr "?Group chat address:vacaciones"
 
-#: gajim/common/const.py:256
-#, fuzzy
+#: gajim/common/const.py:289
 msgid "?Group chat name:Repairs"
-msgstr "Grupos de charla"
+msgstr "?Group chat name:Reparaciones"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
-msgstr ""
+msgstr "?Group chat description:Grupo local de ayuda"
 
-#: gajim/common/const.py:258
-#, fuzzy
+#: gajim/common/const.py:291
 msgid "?Group chat address:repairs"
-msgstr "Grupos de charla"
+msgstr "?Group chat address:reparaciones"
 
-#: gajim/common/const.py:259
-#, fuzzy
+#: gajim/common/const.py:292
 msgid "?Group chat name:News"
-msgstr "Ninguno"
+msgstr "?Group chat name:Noticias"
 
-#: gajim/common/const.py:260
-#, fuzzy
+#: gajim/common/const.py:293
 msgid "?Group chat description:Local news and reports"
-msgstr "La creación de grupos de charla está restringida."
+msgstr "?Group chat description:Noticias locales e informes"
 
-#: gajim/common/const.py:261
-#, fuzzy
+#: gajim/common/const.py:294
 msgid "?Group chat address:news"
-msgstr "Nuevo grupo de charla"
+msgstr "?Group chat address:noticias"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 msgid "Remote server not found"
 msgstr "Servidor remoto no encontrado"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
-msgstr ""
+msgstr "Tiempo agotado en servidor remoto"
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
 msgstr "La dirección no pertenece a un servidor de grupo de conversación"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 msgid "Group chat already exists"
 msgstr "El grupo ya existe"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
 msgstr "El grupo de charla no existe"
 
-#: gajim/common/const.py:273
-#, fuzzy
+#: gajim/common/const.py:306
 msgid "Group chat is closed"
-msgstr "Grupos de charla"
+msgstr "El grupo está cerrado"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr "Este mensaje fue cifrado con OTR y no se pudo descifrar."
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
+"Este mensaje fue cifrado con Legacy OpenPGP y no se pudo descifrar. Puedes "
+"instalar la extensión PGP para gestionar esos mensajes."
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
+"Este mensaje fue cifrado con OpenPGP para XMPP y no se pudo descifrar. "
+"Puedes instalar la extensión OpenPGP para gestionar esos mensajes."
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr "Este mensaje fue cifrado con %s y no se pudo descifrar."
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Haciendo tareas"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Haciendo la compra"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Limpiando"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Cocinando"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Tareas de mantenimiento"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Fregando los platos"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Haciendo la colada"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Arreglando el jardín"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Haciendo un recado"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Paseando al perro"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Bebiendo"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Tomando una cerveza"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Tomando café"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Tomando té"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Tomando un tentempié"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Desayunando"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Cenando"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Almorzando"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Haciendo ejercicio"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Montando en bici"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Bailando"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Paseando"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Corriendo"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Haciendo deporte"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Corriendo"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Esquiando"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Nadando"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Trabajando"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Lavando"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "En el spa"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Lavando los dientes"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Cortando el pelo"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Afeitándome"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Tomando un baño"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Duchándome"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "En una cita"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Fin del día"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Saliendo por ahi"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Escondiéndome"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Rezando"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Vacaciones planificadas"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Pensando"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Relajándome"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Pescando"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Jugando"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Saliendo"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "De fiesta"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Leyendo"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Ensayando"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Comprando"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Fumando"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Socializándome"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "En el solarium"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Viendo la TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Viendo una película"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Hablando"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "En la vida real"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Al videoteléfono"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Viajando"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Conmutar"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Conduciendo"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "En el coche"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "En el bus"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "En el avión"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "En el tren"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "En un viaje"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Caminando"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programando"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "En un encuentro"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Estudiando"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Escribiendo"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Miedoso"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Impresionado"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Amoroso"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Enfadado"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Molesto"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Despierto"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Aburrido"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Animado"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Calmado"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Cauto"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Frío"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Confiado"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Confuso"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Contento"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Irritable"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Alocado"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Creativo"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Curioso"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Desanimado"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Deprimido"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Decepcionado"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Disgustado"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Consternado"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Distraído"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Vergonzoso"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Envidioso"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Excitado"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Flirteador"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustrado"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Agradecido"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Dolido"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Malhumorado"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Culpable"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Feliz"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Deseoso"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Caliente"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Humilde"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Humillado"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Hambriento"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Dolido"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Impresionado"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Atemorizado"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Enamorado"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Indignado"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Curioso"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Intoxicado"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Invencible"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Celoso"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Solitario"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Perdido"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Afortunado"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Significante"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Malhumorado"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervioso"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Ofendido"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Escandalizado"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Juguetón"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Orgulloso"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Relajado"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Aliviado"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Arrepentido"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Inquieto"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Triste"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarcástico"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Satisfecho"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Serio"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Horrorizado"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Tímido"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Enfermo"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Adormilado"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Espontáneo"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Estresado"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Fuerte"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Sorprendido"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Agradecido"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Sediento"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Cansado"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Débil"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Preocupado"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "precisión"
 
-#: gajim/common/const.py:475
-#, fuzzy
+#: gajim/common/const.py:508
 msgid "alt"
-msgstr "por defecto"
+msgstr "altitud"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
-msgstr ""
+msgstr "área"
 
-#: gajim/common/const.py:477
-#, fuzzy
+#: gajim/common/const.py:510
 msgid "bearing"
-msgstr "marino"
+msgstr "relevancia"
 
-#: gajim/common/const.py:478
-#, fuzzy
+#: gajim/common/const.py:511
 msgid "building"
-msgstr "Escondiéndome"
+msgstr "edificio"
 
-#: gajim/common/const.py:479
-#, fuzzy
+#: gajim/common/const.py:512
 msgid "country"
-msgstr "País:"
+msgstr "país"
 
-#: gajim/common/const.py:480
-#, fuzzy
+#: gajim/common/const.py:513
 msgid "countrycode"
-msgstr "Cuenta"
+msgstr "código de país"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
-msgstr ""
+msgstr "referencia"
 
-#: gajim/common/const.py:482
-#, fuzzy
+#: gajim/common/const.py:515
 msgid "description"
-msgstr "Descripción"
+msgstr "descripción"
 
-#: gajim/common/const.py:483
-#, fuzzy
+#: gajim/common/const.py:516
 msgid "error"
-msgstr "Error."
+msgstr "error"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
-msgstr ""
+msgstr "planta"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
-msgstr ""
+msgstr "latitud"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
-msgstr ""
+msgstr "localidad"
 
-#: gajim/common/const.py:487
-#, fuzzy
+#: gajim/common/const.py:520
 msgid "lon"
-msgstr "uno"
+msgstr "longitud"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
-msgstr ""
+msgstr "código postal"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
-msgstr ""
+msgstr "región"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "salón"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
-msgstr ""
+msgstr "velocidad"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
-msgstr ""
+msgstr "calle"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
-msgstr ""
+msgstr "texto"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
-msgstr ""
+msgstr "marca temporal"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
-msgstr ""
+msgstr "URI"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "No se puede obtener el certificado del emisor"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "No se puede obtener el certificado CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "No se puede descifrar la firma del certificado"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "No se puede descifrar la firma del CRL"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "No se puede decodificar la clave pública del emisor"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Fallo en la firma del certificado"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Fallo en la firma CRL"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "El certificado todavía no es válido"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "El certificado ha expirado"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "El CRL todavía no es válido"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "El CRL ha expirado"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Error de formato en el campo notBefore del certificado"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Error de formato en el campo notAfter del certificado"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Error de formato en el campo lastUpdate del CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Error de formato en el campo nextUpdate del CRL"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Memoria llena"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Certificado autofirmado"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado autofirmado en la cadena del certificado"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "No se puede obtener el certificado del emisor local"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "No se puede verificar el primer certificado"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "La cadena del certificado es demasiado larga"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Certificado CA no válido"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "La longitud de la ruta excedió el límite"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Propósito de certificado no soportado"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "El certificado no es de confianza"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certificado rechazado"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "El emisor del asunto no coincide"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "La autoridad y el asunto de la clave identificadora no coinciden"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "La autoridad y el número de serie del emisor no coinciden"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "El uso de la clave no incluye la firma de certificados"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Falló la verificación de la aplicación"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
-msgstr ""
+msgstr "La autoridad firmante del certificado es desconocida"
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 msgid "The certificate has been revoked"
 msgstr "El certificado ha sido revocado"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
-msgstr ""
+msgstr "El certificado no coincide con la identidad esperada del sitio"
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
-msgstr ""
+msgstr "El algoritmo del certificado es inseguro"
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
-msgstr ""
+msgstr "La fecha de activación del certificado está en el futuro"
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 msgid "Unknown validation error"
 msgstr "Error de validación desconocido"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 msgid "The certificate has expired"
 msgstr "El certificado ha expirado"
 
-#: gajim/common/const.py:901
-#, fuzzy
+#: gajim/common/const.py:934
 msgid "Authentication aborted"
-msgstr "Autorización aceptada"
+msgstr "Autenticación abortada"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 msgid "Account disabled"
 msgstr "Cuenta deshabilitada"
 
-#: gajim/common/const.py:903
-#, fuzzy
+#: gajim/common/const.py:936
 msgid "Credentials expired"
-msgstr "El certificado ha expirado"
+msgstr "Las credenciales han expirado"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 msgid "Encryption required"
 msgstr "Cifrado requerido"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 msgid "Authentication mechanism not supported"
 msgstr "Mecanismo de autenticación no soportado"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 msgid "Authentication mechanism too weak"
 msgstr "Mecanismo de autenticación demasiado débil"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
-msgstr ""
+msgstr "Autenticación actualmente no posible"
 
 #: gajim/common/logging_helpers.py:31
 #, python-format
@@ -4675,12 +4587,12 @@ msgstr "Dispositivo por defecto"
 
 #: gajim/common/multimedia_helpers.py:72
 msgid "Audio test"
-msgstr ""
+msgstr "Prueba de audio"
 
 #: gajim/common/multimedia_helpers.py:75 gajim/common/multimedia_helpers.py:91
 #: gajim/common/multimedia_helpers.py:105
 msgid "Autodetect"
-msgstr ""
+msgstr "Autodetectar"
 
 #: gajim/common/multimedia_helpers.py:78 gajim/common/multimedia_helpers.py:93
 #, python-format
@@ -4694,15 +4606,15 @@ msgstr "Pulse: %s"
 
 #: gajim/common/multimedia_helpers.py:89
 msgid "Fake audio output"
-msgstr ""
+msgstr "Salida de audio falso"
 
 #: gajim/common/multimedia_helpers.py:102
 msgid "Video test"
-msgstr ""
+msgstr "Prueba de vídeo"
 
 #: gajim/common/multimedia_helpers.py:107
 msgid "Pipewire"
-msgstr ""
+msgstr "Tubería"
 
 #: gajim/common/multimedia_helpers.py:109
 #, python-format
@@ -4721,12 +4633,12 @@ msgstr "Windows"
 msgid "macOS"
 msgstr "macOS"
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s Error de configuración"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4737,289 +4649,252 @@ msgid ""
 "Error was:\n"
 "%(error)s"
 msgstr ""
+"No se pudo configurar %(text)s. Verifique su configuración.\n"
+"\n"
+"La tubería fue: \n"
+"%(pipeline)s\n"
+"\n"
+"El error fue: \n"
+"%(error)s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
-msgstr ""
+msgstr "entrada de sonido"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
-msgstr ""
+msgstr "salida de sonido"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
-msgstr ""
-
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Carácter no válido en el nombre del host."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Se requiere la dirección del servidor."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Caracter no válido en el nombre de usuario."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Carácter no válido en el recurso."
+msgstr "entrada de vídeo"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "No disponible"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: gajim/common/helpers.py:305
-#, fuzzy
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
-msgstr "Pausada"
+msgstr "?user status:Disponible"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
-#, fuzzy
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
-msgstr "Pausada"
+msgstr "?user status:Disponible"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Desconectado"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
-msgstr "Desconocido"
+msgstr "?contact has status:Desconocido"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
-msgstr "Tiene errores"
+msgstr "?contact has status:Tiene errores"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
-msgstr "Ninguna"
+msgstr "?Subscription we already have:Ninguna"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
-msgstr "Ninguna"
+msgstr "?Ask (for Subscription):Ninguna"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
-msgstr "Ninguno"
+msgstr "?Group Chat Contact Role:Ninguno"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
-msgstr "Ninguno"
+msgstr "?Group Chat Contact Affiliation:Ninguno"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 msgid "Owners"
 msgstr "Propietarios"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Propietario"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 msgid "Administrators"
 msgstr "Administradores"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 msgid "Members"
 msgstr "Miembros"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Miembro"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 msgid "is composing a message…"
 msgstr "está escribiendo un mensaje..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensaje pendiente"
 msgstr[1] "%d mensajes pendientes"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, python-format
 msgid "from group chat %s"
 msgstr "desde el grupo de charla %s"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr "del usuario %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento pendiente"
 msgstr[1] "%d eventos pendientes"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Me gustaría añadirte a mi lista de contactos."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Hola, soy $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "PyCURL no está instalado"
 
-#: gajim/common/helpers.py:1248
-#, fuzzy
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
-msgstr "Expiró el tiempo para cargar la imagen"
+msgstr "Error cargando imagen"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s es un archivo pero podría ser un directorio"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
@@ -5078,9 +4953,8 @@ msgid "Unable to bind to port %d."
 msgstr "No se pudo enlazar al puerto %d."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:267
-#, fuzzy
 msgid "Please check if avahi/bonjour-daemon is running."
-msgstr "Por favor, comprueba si avahi-daemon se encuentra en ejecución."
+msgstr "Por favor, comprueba si avahi/bonjour-daemon está en ejecución."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:361
 #: gajim/common/zeroconf/connection_zeroconf.py:374
@@ -5117,88 +4991,88 @@ msgstr "Error añadiendo el servicio. %s"
 
 #: gajim/common/dbus/logind.py:73
 msgid "Machine is going to sleep"
-msgstr ""
+msgstr "La máquina se va a dormir"
 
 #: gajim/common/dbus/logind.py:103
 msgid "Disconnect from the network"
-msgstr ""
+msgstr "Desconectar de la red"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "El archivo está vacío"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr "El fichero es demasiado grande, el tamaño máximo permitido es: %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 msgid "Encrypting file…"
 msgstr "Cifrando fichero…"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
-msgstr ""
+msgstr "Solicitud de ranura de subida de archivos HTTP…"
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
-msgstr ""
+msgstr "Subida a través de carga de archivos HTTP…"
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Cambiar información de estado"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Cambiar estado"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Definir la presencia y una descripción"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Libre para hablar"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "En línea"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "No molestar."
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Desconectado"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Descripción de la presencia:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Se ha cambiado el estado."
 
-#: gajim/common/modules/roster_item_exchange.py:102
-#, fuzzy, python-format
+#: gajim/common/modules/roster_item_exchange.py:103
+#, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
-msgstr "Contacto enviado: \"%s\" (%s)"
+msgstr "Contacto enviado: \"%(jid)s\" (%(name)s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Contactos enviados:"
 
@@ -5214,50 +5088,46 @@ msgstr "columna"
 
 #: gajim/data/gui/join_groupchat_window.ui:97
 msgid "Join group chat every time Gajim is started"
-msgstr ""
+msgstr "Unirse al grupo cada vez que arranque Gajim"
 
 #: gajim/data/gui/join_groupchat_window.ui:113
 msgid "Join Automatically"
-msgstr ""
+msgstr "Unirse automáticamente"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Cuenta"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
-#, fuzzy
 msgid "Group chat"
-msgstr "Grupos de charla"
+msgstr "Grupo de chat"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 msgid "Password"
 msgstr "Contraseña"
 
 #: gajim/data/gui/join_groupchat_window.ui:253
-#, fuzzy
 msgid "Bookmark group chat"
-msgstr "Añadir este salón a marcadores (Ctrl+B)"
+msgstr "Añadir salón a marcadores"
 
 #: gajim/data/gui/join_groupchat_window.ui:270
 msgid "Bookmark"
 msgstr "Marcador"
 
 #: gajim/data/gui/join_groupchat_window.ui:339
-#, fuzzy
 msgid "Recently used group chats"
-msgstr "en _grupos de charla"
+msgstr "Grupos usados recientemente"
 
 #: gajim/data/gui/join_groupchat_window.ui:360
 msgid "Search group chats on selected server"
 msgstr "Buscar grupos de conversación en el servidor seleccionado"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
-#, fuzzy
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
-msgstr "_Entrar"
+msgstr "Unirse"
 
 #: gajim/data/gui/filetransfer_progress.ui:110 gajim/gtk/filetransfer.py:121
 msgid "Progress"
@@ -5272,17 +5142,17 @@ msgid "Time remaining"
 msgstr "Tiempo restante"
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -5306,9 +5176,8 @@ msgid "Status:"
 msgstr "Estado:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#, fuzzy
 msgid "_Store conversation history"
-msgstr "Histórico de conversaciones"
+msgstr "Almacenar histórico de conversación"
 
 #: gajim/data/gui/zeroconf_information_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:389
@@ -5350,14 +5219,12 @@ msgid "Activity:"
 msgstr "Actividad:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:115
-#, fuzzy
 msgid "Tune:"
-msgstr "Música:"
+msgstr "Melodía:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:128
-#, fuzzy
 msgid "Location:"
-msgstr "Notificaciones"
+msgstr "Ubicación:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:193
 msgid "Subscription:"
@@ -5371,30 +5238,29 @@ msgstr "_Estado"
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:188
 msgid "Common Name (CN)"
-msgstr ""
+msgstr "Nombre común (CN)"
 
 #: gajim/data/gui/certificate_dialog.ui:95
 #: gajim/data/gui/certificate_dialog.ui:217
 msgid "Organization (O)"
-msgstr ""
+msgstr "Organización (O)"
 
 #: gajim/data/gui/certificate_dialog.ui:124
 #: gajim/data/gui/certificate_dialog.ui:246
 msgid "Organizational Unit (OU)"
-msgstr ""
+msgstr "Unidad organizativa (OU)"
 
 #: gajim/data/gui/certificate_dialog.ui:153
-#, fuzzy
 msgid "Serial Number"
-msgstr "Número GG:"
+msgstr "Número de Serie"
 
 #: gajim/data/gui/certificate_dialog.ui:275
 msgid "Issued on"
-msgstr ""
+msgstr "Emitido el"
 
 #: gajim/data/gui/certificate_dialog.ui:304
 msgid "Expires on"
-msgstr ""
+msgstr "Caduca el"
 
 #: gajim/data/gui/certificate_dialog.ui:333
 msgid "SHA-1"
@@ -5402,19 +5268,19 @@ msgstr "SHA-1"
 
 #: gajim/data/gui/certificate_dialog.ui:348
 msgid "Issued to"
-msgstr ""
+msgstr "Emitido a"
 
 #: gajim/data/gui/certificate_dialog.ui:364
 msgid "Issued by"
-msgstr ""
+msgstr "Emitido por"
 
 #: gajim/data/gui/certificate_dialog.ui:380
 msgid "Validity"
-msgstr ""
+msgstr "Validez"
 
 #: gajim/data/gui/certificate_dialog.ui:396
 msgid "Fingerprints"
-msgstr ""
+msgstr "Huellas"
 
 #: gajim/data/gui/certificate_dialog.ui:431
 msgid "SHA-256"
@@ -5426,14 +5292,13 @@ msgstr "Copiar información de certificado"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Descripción"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
-#, fuzzy
 msgid "_Send Files"
-msgstr "Enviar archivo"
+msgstr "Enviar ficheros"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
 msgid "Send"
@@ -5448,19 +5313,16 @@ msgid "Add Files"
 msgstr "Añadir ficheros"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:147
-#, fuzzy
 msgid "Remove Files"
-msgstr "_Eliminar"
+msgstr "Eliminar ficheros"
 
 #: gajim/data/gui/profile_window.ui:67
-#, fuzzy
 msgid "Clear Avatar"
-msgstr "Avatar del usuario:"
+msgstr "Borrar el avatar"
 
 #: gajim/data/gui/profile_window.ui:137
-#, fuzzy
 msgid "Set Avatar…"
-msgstr "Elegir Imagen"
+msgstr "Establecer avatar…"
 
 #: gajim/data/gui/profile_window.ui:175
 #: gajim/data/gui/vcard_information_window.ui:411
@@ -5470,7 +5332,6 @@ msgstr "Nombre completo"
 #: gajim/data/gui/profile_window.ui:307 gajim/data/gui/profile_window.ui:1004
 #: gajim/data/gui/vcard_information_window.ui:720
 #: gajim/data/gui/vcard_information_window.ui:1396
-#, fuzzy
 msgid "Phone No."
 msgstr "Teléfono"
 
@@ -5487,20 +5348,18 @@ msgstr "Cumpleaños"
 #: gajim/data/gui/profile_window.ui:370
 #: gajim/data/gui/vcard_information_window.ui:688
 #: gajim/data/gui/plugins_window.ui:304
-#, fuzzy
 msgid "Homepage"
-msgstr "Página web:"
+msgstr "Página web"
 
 #: gajim/data/gui/profile_window.ui:387 gajim/data/gui/profile_window.ui:976
 #: gajim/data/gui/vcard_information_window.ui:704
 #: gajim/data/gui/vcard_information_window.ui:1380
-#, fuzzy
 msgid "E-Mail"
-msgstr "Correo-e:"
+msgstr "Correo electrónico"
 
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
-msgstr ""
+msgstr "Principal"
 
 #. Family Name
 #: gajim/data/gui/profile_window.ui:462
@@ -5511,9 +5370,8 @@ msgstr "Familia"
 #. Given Name
 #: gajim/data/gui/profile_window.ui:489
 #: gajim/data/gui/vcard_information_window.ui:896
-#, fuzzy
 msgid "Given"
-msgstr "Nombre de pila:"
+msgstr "Nombre de pila"
 
 #. Middle Name
 #: gajim/data/gui/profile_window.ui:516
@@ -5525,16 +5383,14 @@ msgstr "Medio:"
 #. Prefix in Name
 #: gajim/data/gui/profile_window.ui:532
 #: gajim/data/gui/vcard_information_window.ui:837
-#, fuzzy
 msgid "Prefix"
 msgstr "Prefijo"
 
 #. Suffix in Name
 #: gajim/data/gui/profile_window.ui:569
 #: gajim/data/gui/vcard_information_window.ui:912
-#, fuzzy
 msgid "Suffix"
-msgstr "Sufijo:"
+msgstr "Sufijo"
 
 #: gajim/data/gui/profile_window.ui:596 gajim/data/gui/profile_window.ui:1031
 #: gajim/data/gui/vcard_information_window.ui:489
@@ -5551,16 +5407,14 @@ msgstr "Dirección Adicional"
 #: gajim/data/gui/profile_window.ui:652 gajim/data/gui/profile_window.ui:1085
 #: gajim/data/gui/vcard_information_window.ui:505
 #: gajim/data/gui/vcard_information_window.ui:1195
-#, fuzzy
 msgid "City"
-msgstr "Ciudad:"
+msgstr "Ciudad"
 
 #: gajim/data/gui/profile_window.ui:669 gajim/data/gui/profile_window.ui:1148
 #: gajim/data/gui/vcard_information_window.ui:521
 #: gajim/data/gui/vcard_information_window.ui:1211
-#, fuzzy
 msgid "State"
-msgstr "Estado:"
+msgstr "Estado"
 
 #: gajim/data/gui/profile_window.ui:716 gajim/data/gui/profile_window.ui:1112
 #: gajim/data/gui/vcard_information_window.ui:595
@@ -5571,9 +5425,8 @@ msgstr "Código postal"
 #: gajim/data/gui/profile_window.ui:743 gajim/data/gui/profile_window.ui:1175
 #: gajim/data/gui/vcard_information_window.ui:611
 #: gajim/data/gui/vcard_information_window.ui:1260
-#, fuzzy
 msgid "Country"
-msgstr "País:"
+msgstr "País"
 
 #: gajim/data/gui/profile_window.ui:761 gajim/data/gui/profile_window.ui:1192
 #: gajim/data/gui/vcard_information_window.ui:671
@@ -5583,15 +5436,13 @@ msgstr "<b>Dirección</b>"
 
 #: gajim/data/gui/profile_window.ui:786
 #: gajim/data/gui/vcard_information_window.ui:958
-#, fuzzy
 msgid "<b>Name Details</b>"
-msgstr "<b>Nombre:</b>"
+msgstr "<b>Detalles del nombre</b>"
 
 #: gajim/data/gui/profile_window.ui:853
 #: gajim/data/gui/vcard_information_window.ui:1040
-#, fuzzy
 msgid "Company"
-msgstr "Compañía:"
+msgstr "Compañía"
 
 #: gajim/data/gui/profile_window.ui:881
 #: gajim/data/gui/vcard_information_window.ui:1073
@@ -5600,9 +5451,8 @@ msgstr "Departamento"
 
 #: gajim/data/gui/profile_window.ui:908
 #: gajim/data/gui/vcard_information_window.ui:1104
-#, fuzzy
 msgid "Position"
-msgstr "Posición:"
+msgstr "Cargo"
 
 #: gajim/data/gui/profile_window.ui:945
 #: gajim/data/gui/vcard_information_window.ui:1134
@@ -5611,9 +5461,8 @@ msgid "Role"
 msgstr "Puesto"
 
 #: gajim/data/gui/profile_window.ui:1207
-#, fuzzy
 msgid "<b>Contact</b>"
-msgstr "<b>Hora del contacto:</b>"
+msgstr "<b>Contacto</b>"
 
 #: gajim/data/gui/profile_window.ui:1261
 #: gajim/data/gui/vcard_information_window.ui:1452
@@ -5623,46 +5472,53 @@ msgstr "Trabajo"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Acerca de"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
-#, fuzzy
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+"Inicia un nuevo chat, únete a un grupo o busca nuevos grupos a nivel "
+"mundial. También puedes ingresar una dirección XMPP."
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 msgid "Global Group Chat Search"
-msgstr "Entrar a un salón de chat"
+msgstr "Búsqueda global de grupos"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
-#, fuzzy
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 msgid "_Back"
-msgstr "Vuelvo pronto"
+msgstr "Volver"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Entrar"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
 msgstr "Seleccionar cuenta"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
-msgstr ""
+msgstr "_Seleccionar"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
 msgstr ""
+"No se han encontrado contactos\n"
+"También puedes escribir una dirección XMPP"
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
-msgstr ""
+msgstr "Pa_usar/Reanudar"
 
 #: gajim/data/gui/filetransfers.ui:45
 msgid "_Open Folder"
@@ -5673,9 +5529,8 @@ msgid "File Transfers"
 msgstr "Transferencias"
 
 #: gajim/data/gui/filetransfers.ui:94
-#, fuzzy
 msgid "_Show notification when file transfer is complete"
-msgstr "_Notificarme cuando una transferencia finalice"
+msgstr "Mostrar notificación cuando una transferencia finalice"
 
 #: gajim/data/gui/filetransfers.ui:134
 msgid "file transfers list"
@@ -5686,27 +5541,23 @@ msgid "A list of active, completed and stopped file transfers"
 msgstr "Una lista de transferencias activas, finalizadas y detenidas"
 
 #: gajim/data/gui/filetransfers.ui:157
-#, fuzzy
 msgid "Remove completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Elimina de la lista las transferencias finalizadas, canceladas y fallidas"
 
 #: gajim/data/gui/filetransfers.ui:170
-#, fuzzy
 msgid "Pause or resume file transfer"
-msgstr "Cancela la transferencia"
+msgstr "Pausar o reanudar la transferencia de fichero"
 
 #: gajim/data/gui/filetransfers.ui:183
-#, fuzzy
 msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr ""
-"Cancela la transferencia de archivo seleccionada y elimina el archivo "
-"incompleto"
+"Cancela la transferencia seleccionada de archivo y elimina los archivos "
+"incompletos"
 
 #: gajim/data/gui/filetransfers.ui:207
-#, fuzzy
 msgid "Shows a list of file transfers between you and your contacts"
-msgstr "Muestra una lista de transferencias entre tú y otros"
+msgstr "Muestra una lista de transferencias entre tú y tus contactos"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
 msgid "Bold"
@@ -5725,6 +5576,7 @@ msgid "Strike"
 msgstr "Tachado"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Color"
 
@@ -5733,131 +5585,116 @@ msgid "Font"
 msgstr "Fuente"
 
 #: gajim/data/gui/groupchat_control.ui:76 gajim/data/gui/chat_control.ui:340
-#, fuzzy
 msgid "Clear formatting"
 msgstr "Limpiar formato"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 msgid "Choose encryption"
 msgstr "Elegir cifrado"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Mostrar una lista de emoticonos (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:509
 msgid "Joining…"
-msgstr "Expulsando..."
+msgstr "Uniéndose…"
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 msgid "Enter new nickname"
 msgstr "Escribir nuevo alias"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 msgid "Ch_ange"
 msgstr "Cambiar"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Cambiar asunto"
+
+#: gajim/data/gui/groupchat_control.ui:786
 msgid "Enter password"
 msgstr "Introduzca contraseña"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 msgid "_Leave Group Chat"
 msgstr "Abandonar grupo"
 
-#: gajim/data/gui/groupchat_control.ui:962
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1007
 msgid "Gajim will not try to join this group chat again"
-msgstr "Si está marcado, Gajim entrará a este salón al inicio"
+msgstr "Gajim no volverá a intentar unirse a este grupo otra vez"
 
-#: gajim/data/gui/groupchat_control.ui:1018
-msgid "An error occured"
+#: gajim/data/gui/groupchat_control.ui:1063
+msgid "An error occurred"
 msgstr "Ha ocurrido un error"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr "Intentar otra vez"
 
-#: gajim/data/gui/groupchat_control.ui:1231
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1276
 msgid "Kick participant"
-msgstr "Participante"
+msgstr "Expulsar participante"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
-msgstr "Gestionar emoticonos"
+msgstr "Insertar emoticono"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr "Razón (opcional)"
 
-#: gajim/data/gui/groupchat_control.ui:1357
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1402
 msgid "Ban participant"
-msgstr "Participante"
+msgstr "Prohibir al participante"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Banear"
 
-#: gajim/data/gui/groupchat_control.ui:1483
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1528
 msgid "Destroy group chat"
-msgstr "Nuevo grupo de charla"
+msgstr "Destruir grupo"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 msgid "_Destroy"
 msgstr "_Destruir"
 
-#: gajim/data/gui/groupchat_control.ui:1555
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
-msgstr "También puedes introducir un lugar alternativo:"
+msgstr "Lugar alternativo (opcional)..."
 
-#: gajim/data/gui/groupchat_control.ui:1572
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1617
 msgid "Reason (optional)..."
-msgstr "Motivo"
+msgstr "Motivo (opcional)..."
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
-msgstr ""
+msgstr "Motivo de la destrucción"
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
-msgstr ""
+msgstr "Donde debería ir los participantes"
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
 msgstr "Introduce un nuevo nombre para este grupo"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 msgid "_Invite"
 msgstr "_Invitar"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Tipo de evento"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Eventos"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -5908,7 +5745,7 @@ msgstr "<b>#</b>"
 
 #: gajim/data/gui/chat_control.ui:442
 msgid "The last message was written on a mobile client"
-msgstr ""
+msgstr "El último mensaje fue escrito en un cliente móvil"
 
 #: gajim/data/gui/mam_preferences.ui:14
 #: gajim/data/gui/preferences_window.ui:120
@@ -5927,9 +5764,8 @@ msgid "Never"
 msgstr "Nunca"
 
 #: gajim/data/gui/mam_preferences.ui:53
-#, fuzzy
 msgid "_Default"
-msgstr "Por defecto"
+msgstr "Por _defecto"
 
 #: gajim/data/gui/mam_preferences.ui:136
 msgid "Archive"
@@ -5941,36 +5777,33 @@ msgid "Add"
 msgstr "Dirección"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 msgid "Remove"
 msgstr "Eliminar"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
-#, fuzzy
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 msgid "Resource"
-msgstr "Recurso:"
+msgstr "Recurso"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Estado"
 
 #: gajim/data/gui/vcard_information_window.ui:106
-#, fuzzy
 msgid "Client"
-msgstr "Cliente:"
+msgstr "Cliente"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "Sistema"
 
 #: gajim/data/gui/vcard_information_window.ui:140
-#, fuzzy
 msgid "Contact time"
-msgstr "Nombre de contacto"
+msgstr "Hora del contacto"
 
 #: gajim/data/gui/vcard_information_window.ui:240
 msgid "User avatar"
@@ -5982,9 +5815,8 @@ msgstr "Avatar configurado"
 
 #. Given Name
 #: gajim/data/gui/vcard_information_window.ui:287
-#, fuzzy
 msgid "Ask"
-msgstr "Pregunta:"
+msgstr "Preguntar"
 
 #. Family Name
 #: gajim/data/gui/vcard_information_window.ui:304
@@ -6015,43 +5847,36 @@ msgid "Custom"
 msgstr "Personalizado"
 
 #: gajim/data/gui/preferences_window.ui:52
-#, fuzzy
 msgid "Pop it up"
-msgstr "_Emerger"
+msgstr "Emerger"
 
 #: gajim/data/gui/preferences_window.ui:55
-#, fuzzy
 msgid "Notify me about it"
-msgstr "_Notificarme"
+msgstr "Notificarme"
 
 #: gajim/data/gui/preferences_window.ui:58
-#, fuzzy
 msgid "Show only in contact list"
-msgstr "Mostrar sólo contactos _activos"
+msgstr "Mostrar solo en lista de contactos"
 
 #: gajim/data/gui/preferences_window.ui:69
-#, fuzzy
 msgid "Detached contact list with detached chats"
-msgstr "Lista separada con chats separados"
+msgstr "Lista de contactos separada con chats separados"
 
 #: gajim/data/gui/preferences_window.ui:72
-#, fuzzy
 msgid "Detached contact list with single chat"
-msgstr "Lista separada con una sola charla"
+msgstr "Lista de contactos separada con una sola conversación"
 
 #: gajim/data/gui/preferences_window.ui:75
 msgid "Single window for everything"
 msgstr "Ventana única para todo"
 
 #: gajim/data/gui/preferences_window.ui:78
-#, fuzzy
 msgid "Detached contact list with chat grouped by account"
-msgstr "Lista separada con chat agrupado por cuenta"
+msgstr "Lista de contactos separada con chat agrupado por cuenta"
 
 #: gajim/data/gui/preferences_window.ui:81
-#, fuzzy
 msgid "Detached contact list with chat grouped by type"
-msgstr "Lista separada con chat agrupado por tipo"
+msgstr "Lista de contactos separada con chat agrupado por tipo"
 
 #: gajim/data/gui/preferences_window.ui:92
 msgid "No status messages"
@@ -6090,276 +5915,276 @@ msgid "Right"
 msgstr "Derecha"
 
 #: gajim/data/gui/preferences_window.ui:241
-#, fuzzy
 msgid "_Window behavior"
-msgstr "_Comportamiento de la ventana:"
+msgstr "Comportamiento de la ventana"
 
 #: gajim/data/gui/preferences_window.ui:296
-#, fuzzy
 msgid "_Show contact list on startup"
 msgstr "Mostrar la lista de contactos al inicio de Gajim"
 
-#: gajim/data/gui/preferences_window.ui:311
-#, fuzzy
-msgid "Show _avatar in chat tabs"
-msgstr "Mostrar avatar en la pestaña de las conversaciones"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
-msgstr ""
+msgstr "Colocación de pestañas"
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
-msgstr ""
+msgstr "Salir de Gajim al cerrar la lista de contactos"
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
+"Si está habilitado, Gajim se cerrará al cerrar la ventana de la lista de "
+"contactos en lugar de minimizar el área de notificación del sistema"
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
-msgstr ""
+msgstr "Comportamiento de ventanas y pestañas"
 
-#: gajim/data/gui/preferences_window.ui:423
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:403
+msgid "Me_rge accounts"
+msgstr "Combina_r cuentas"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr "Mostrar tus cuentas combinadas en una sola"
+
+#: gajim/data/gui/preferences_window.ui:421
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Mostrar en el roster los a_vatares de los contactos"
 
-#: gajim/data/gui/preferences_window.ui:427
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:425
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
 "in group chats"
 msgstr ""
-"Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
-"grupos de conversación"
+"Si está marcado, los avatares de los contactos se mostrarán en la ventana de "
+"la lista de contactos y en los grupos."
 
-#: gajim/data/gui/preferences_window.ui:441
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:439
 msgid "Show status _messages of contacts in contact list"
 msgstr "Mostrar en el roster los _mensajes de estado de los contactos"
 
-#: gajim/data/gui/preferences_window.ui:445
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:443
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
 "name, in the contact list window, and in group chats"
 msgstr ""
-"Si está marcado, Gajim mostrará los mensajes de estado de los contactos bajo "
-"el nombre de contacto en el roster y grupos de conversación"
+"Si está marcado, los mensajes de estado de los contactos se mostrarán debajo "
+"del nombre del contacto, en la ventana de la lista de contactos y en los "
+"grupos."
 
-#: gajim/data/gui/preferences_window.ui:459
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:457
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
-msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
+msgstr ""
+"Mostrar información e_xtra de contactos en la lista de contactos (estado de "
+"ánimo, actividad, ...)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
+"Si está marcada, la información adicional publicada por el contacto se "
+"mostrará en la lista de contactos. La información adicional (publicada a "
+"través de PEP) puede incluir, p.ej. estado de ánimo, actividad, melodía, "
+"ubicación, ..."
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: gajim/data/gui/preferences_window.ui:494
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:492
 msgid "in _contact list"
-msgstr "Contactos enviados:"
+msgstr "en lista de _contactos"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "en _grupos de charla"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 msgid "Contact List Appearance"
 msgstr "Aspecto de la lista de contactos"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
-msgstr ""
+msgstr "Habilitar auto copia"
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
+"Si está habilitado, la selección de texto se copiará en el portapapeles, de "
+"lo contrario puede copiar texto con CTRL + MAYÚS + C"
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr "Habilitar corrector ortográfico"
 
-#: gajim/data/gui/preferences_window.ui:644
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. 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. "
 "Needs gspell to be installed."
 msgstr ""
-"Si está marcado, Gajim resaltará errores de escritura en la entrada de las "
-"ventanas de conversación. Si no se definió ningún idioma vía botón derecho "
-"en el campo de entrada, será usado el idioma por defecto."
+"Si está marcado, se resaltarán los errores ortográficos en los campos de "
+"entrada de las ventanas de chat. Si no se establece explícitamente ningún "
+"idioma haciendo clic derecho en el campo de entrada, se usará el idioma "
+"predeterminado para este contacto o grupo. Necesita gspell instalado."
 
-#: gajim/data/gui/preferences_window.ui:658
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:656
 msgid "Show message recei_pts (✔)"
-msgstr "contenido del mensaje"
+msgstr "Mostrar rece_pciones de mensajes (✔)"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
+"Si está marcado, se mostrará una pequeña marca de verificación después de "
+"cada mensaje cuando se recibió. Ten en cuenta que esto no es compatible con "
+"todos los clientes y, por lo tanto, podría ser engañoso."
 
-#: gajim/data/gui/preferences_window.ui:676
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:674
 msgid "_Show XHTML formatting"
-msgstr "Mostrar una lista de formateos"
+msgstr "Mostrar formateo XHTML"
 
-#: gajim/data/gui/preferences_window.ui:693
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:691
 msgid "Display status messages in _single chats"
-msgstr "Mostrar en el roster los _mensajes de estado de los contactos"
+msgstr "Mostrar mensajes de e_stado en chats individuales"
 
-#: gajim/data/gui/preferences_window.ui:697
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
 msgstr ""
-"Si es False, Gajim nunca más mostrará la línea de estado cuando un contacto "
-"cambie su estado o su mensaje de estado"
+"Si está marcada, las líneas de estado se mostrarán en chats 1 a 1 cuando un "
+"contacto cambie su estado o mensaje de estado"
 
-#: gajim/data/gui/preferences_window.ui:711
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:709
 msgid "Show subject after _joining a group chat"
-msgstr "No se pudo entrar al grupo de charla"
+msgstr "Mostrar el asunto después de unirse a un grupo"
 
-#: gajim/data/gui/preferences_window.ui:715
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:713
 msgid "If checked, the subject will be shown when joining a group chat"
-msgstr "No se pudo entrar al grupo de charla"
+msgstr "Si está marcado, el asunto se mostrará al unirse a un grupo"
 
-#: gajim/data/gui/preferences_window.ui:737
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:735
 msgid "Group Chat Settings"
-msgstr "Atajos de conversaciones"
+msgstr "Configuraciones del grupo"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
-msgstr ""
+msgstr "Mostrar unirse/salir (predeterminado)"
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
+"Si los mensajes de estado de unirse/salir se muestran en el grupo. Esta "
+"configuración se puede anular en el menú de grupo."
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
+"Umbral de sincronización predeterminado para los grupos públicos nuevos. "
+"Esta configuración se puede anular en el menú de grupo."
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
-msgstr ""
+msgstr "Umbral de sincronización predeterminado"
 
-#: gajim/data/gui/preferences_window.ui:819
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:817
 msgid "Show status changes (Default)"
-msgstr "_Registrar cambios de estado de los contactos"
+msgstr "Mostrar cambios de estado (Por defecto)"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
+"Si se muestran mensajes de cambio de estado en el grupo. Esta configuración "
+"se puede anular en el menú de chat de grupo."
 
-#: gajim/data/gui/preferences_window.ui:880
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:878
 msgid "Show chatstate in tabs"
-msgstr "¿Mostrar botón de cerrar en la pestaña?"
+msgstr "Mostrar estado de conversación en pestañas"
 
-#: gajim/data/gui/preferences_window.ui:884
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:882
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr ""
-"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
-"estás usando"
+"Si está marcado, la pestaña se coloreará de acuerdo al estado del contacto"
 
-#: gajim/data/gui/preferences_window.ui:898
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:896
 msgid "Show chatstate in contact list"
-msgstr "¿Mostrar botón de cerrar en la pestaña?"
+msgstr "Mostrar estado en la lista de contactos"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
+"Si está marcado, la fila del contacto se coloreará de acuerdo al estado "
+"actual del contacto"
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
+"estás usando"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Último estado"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Charla"
 
-#: gajim/data/gui/preferences_window.ui:1011
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1009
 msgid "Show _notification area icon"
-msgstr "Usar icono en el á_rea de notificación"
+msgstr "Mostrar icono en el área de _notificación"
 
-#: gajim/data/gui/preferences_window.ui:1030
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1028
 msgid "_When new event is received"
-msgstr "Cuando se recibe un nuevo evento:"
+msgstr "Cuando se recibe un nuevo evento"
 
-#: gajim/data/gui/preferences_window.ui:1071
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1069
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
-"Permitir notificaciones emergentes cuando estoy _ausente, no disponible, "
-"ocupado o invisible."
+"Mostrar notificaciones emergente cuando una ventana de chat ya está abierta"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Permitir notificaciones emergentes cuando estoy _ausente, no disponible u "
 "ocupado"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Notif_icarme de los contactos que se conecten"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6368,65 +6193,62 @@ msgstr ""
 "Gajim te notificará de nuevos eventos a través de un mensaje emergente en la "
 "esquina inferior derecha de la pantalla"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cuand un contacto: "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Notificaciones Visuales"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Gestio_nar..."
 
-#: gajim/data/gui/preferences_window.ui:1222
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Permitir sonido cuando estoy ocupado"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 msgid "No_t Available"
 msgstr "No disponible"
 
-#: gajim/data/gui/preferences_window.ui:1293
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
-"Si está marcado, Gajim cambiará el estado a no disponible cuando el "
-"ordenador ya no se use"
+"Si está marcado, el estado cambiará a no disponible cuando el ordenador no "
+"se use durante el tiempo especificado"
 
-#: gajim/data/gui/preferences_window.ui:1310
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
-"Si está marcado, Gajim cambiará el estado a no disponible cuando el "
-"ordenador ya no se use"
+"Si está marcado, el estado cambiará a ausente cuando el ordenador no se use "
+"durante el tiempo especificado"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6439,7 +6261,7 @@ msgstr ""
 "$S será reemplazado por el anterior mensaje de estado\n"
 "$T será reemplazado por la activación del auto-ausente"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6452,38 +6274,39 @@ msgstr ""
 "$S será reemplazado por el anterior mensaje de estado\n"
 "$T será reemplazado por la activación del auto-no disponible"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 msgid "Minutes"
 msgstr "Minutos"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 msgid "Automatic Status"
 msgstr "Estado automático"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
-msgstr ""
+msgstr "_Recordar y restaurar estado de la última sesión"
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
+"Si está marcado, se restaurará el estado y el mensaje de estado usado en la "
+"última sesión"
 
-#: gajim/data/gui/preferences_window.ui:1486
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1484
 msgid "Ask for status message when I"
-msgstr "Preguntar mensaje de estado cuando esté: "
+msgstr "Preguntar por el mensaje de estado cuando yo"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Cone_ctar"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6491,62 +6314,61 @@ msgstr ""
 "Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
 "mensaje por defecto especificado."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Mensajes por defecto"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Activado"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 msgid "Status Messages"
 msgstr "Mensajes de estado"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Mensajes de estado predefinidos"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 msgid "Themes"
 msgstr "Temas"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 msgid "_Theme"
 msgstr "_Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Configurar colores y fuentes de la interfaz"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 msgid "_Dark Theme"
 msgstr "Tema Oscuro"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
-msgstr ""
+msgstr "Emoticonos"
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 msgid "_Emoji Theme"
 msgstr "Tema para Emoticonos"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
-msgstr ""
+msgstr "Iconos"
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Set de _iconos de estado:"
 
-#: gajim/data/gui/preferences_window.ui:1981
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1989
 msgid "Use transports _icons"
-msgstr "Usar iconos de _transporte"
+msgstr "Usar _iconos de transportes"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6556,125 +6378,127 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
-msgstr "Gestionar emoticonos"
+msgstr "_Convertir emoticonos ASCII"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Estilo"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 msgid "Show _Features"
 msgstr "Mostrar características"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr "Dispositivo de salida de a_udio"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr "Dispositivo de entrada de _audio"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr "Audio"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr "Vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 msgid "_Video input device"
 msgstr "Dispositivo de entrada de _vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 msgid "Video output"
 msgstr "Salida de vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2343
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
-msgstr "Tasa de fotogramas"
+msgstr "Tasa de _fotogramas de vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2372
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
-msgstr "Tamaño del vídeo"
+msgstr "Tamaño de vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2397
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
-msgstr "Ver fuente de vídeo"
+msgstr "V_er la propia fuente de vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Conexión"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 msgid "STU_N server"
 msgstr "Servidor STU_N"
 
-#: gajim/data/gui/preferences_window.ui:2448
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
-"STUN nombre de host del servidor. Si no se proporciona, Gajim intentará\n"
-"encontrar uno en el servidor"
+"Nombre del servidor STUN. Si no se proporciona, Gajim intentará\n"
+"encontrar uno en el servidor. (Ejemplo: stun.iptel.org)"
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr "Audio/Vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2520
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
-msgstr "Proxy global:"
+msgstr "Proxy _global"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Gestionar..."
 
-#: gajim/data/gui/preferences_window.ui:2580
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2587
 msgid "_Store status changes of contacts in history"
-msgstr "_Registrar cambios de estado de los contactos"
+msgstr "Guardar cambios de estados de contactos en el historial"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Si está marcado, Gajim recordará la contraseña para esta cuenta"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
+msgstr "Abre carpeta conteniendo trazas de depuración"
+
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr "¡Atención: Por favor, use estas opciones con precaución!"
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Editor avanzado de configuración (ACE)"
 
 #: gajim/data/gui/groupchat_config.ui:55
-#, fuzzy
 msgid ""
 "<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
@@ -6683,11 +6507,11 @@ msgid ""
 "&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/"
 "resource)\n"
 msgstr ""
-"<b>Jabber-ID</b>\n"
+"<b>Dirección XMPP</b>\n"
 "&lt;usuario@dominio/recurso&gt; (sólo ese recurso coincide)\n"
 "&lt;usuario@dominio&gt; (cualquier recurso coincide)\n"
-"&lt;dominio/recurso&gt; (sólo lo que coincida con el recurso)\n"
-"&lt;dominio&gt; (el dominio coincide consigo mismo, tal como hace cualquier "
+"&lt;dominio/recurso&gt; (sólo lo que coincida el recurso)\n"
+"&lt;dominio&gt; (el dominio en sí coincide, tal como hace cualquier "
 "usuario@dominio o dominio/recurso)\n"
 
 #: gajim/data/gui/groupchat_config.ui:132
@@ -6762,19 +6586,16 @@ msgid "_Subscription"
 msgstr "_Subscripción"
 
 #: gajim/data/gui/contact_context_menu.ui:115
-#, fuzzy
 msgid "_Allow contact to see my status"
-msgstr "Permitirle a este contacto ver mi estado"
+msgstr "Permitir al contacto ver mi estado"
 
 #: gajim/data/gui/contact_context_menu.ui:123
-#, fuzzy
 msgid "A_sk to see contact status"
-msgstr "Pregunta para ver _su estado"
+msgstr "Pregunta para ver el e_stado del contacto"
 
 #: gajim/data/gui/contact_context_menu.ui:131
-#, fuzzy
 msgid "_Forbid contact to see my status"
-msgstr "Prohibirle ver mi estado"
+msgstr "Prohibir al contacto ver mi estado"
 
 #: gajim/data/gui/contact_context_menu.ui:159
 msgid "_Unignore"
@@ -6807,9 +6628,8 @@ msgid "Prox_y"
 msgstr "Prox_y"
 
 #: gajim/data/gui/account_wizard.ui:110
-#, fuzzy
 msgid "Manage Proxies..."
-msgstr "Gestionar perfiles del Proxy"
+msgstr "Gestionar Proxies..."
 
 #: gajim/data/gui/account_wizard.ui:131
 msgid "Advanced Settings"
@@ -6821,7 +6641,7 @@ msgstr "_Tipo"
 
 #: gajim/data/gui/account_wizard.ui:203
 msgid "Welcome"
-msgstr ""
+msgstr "Bienvenido"
 
 #: gajim/data/gui/account_wizard.ui:219
 #, fuzzy
@@ -6830,7 +6650,7 @@ msgstr "Por favor, escribir una nueva contraseña."
 
 #: gajim/data/gui/account_wizard.ui:237
 msgid "Your XMPP address (e.g. user@example.org)"
-msgstr ""
+msgstr "Tu dirección XMPP (ej. usuario@ejemplo.org)"
 
 #: gajim/data/gui/account_wizard.ui:239
 #: gajim/data/gui/single_message_window.ui:59
@@ -6841,12 +6661,11 @@ msgstr "usuario@ejemplo.org"
 msgid "Your password"
 msgstr "Tu contraseña"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
-#, fuzzy
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 msgid "_Advanced Settings"
-msgstr "Acciones A_vanzadas"
+msgstr "Configuraciones avanzadas"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Usar nombre de host y puerto personalizados"
@@ -6858,12 +6677,11 @@ msgstr "_Conectar"
 
 #: gajim/data/gui/account_wizard.ui:288
 msgid "Log in with your credentials"
-msgstr ""
+msgstr "Conectar con tus credenciales"
 
 #: gajim/data/gui/account_wizard.ui:304
-#, fuzzy
 msgid "or"
-msgstr "Tor"
+msgstr "o"
 
 #: gajim/data/gui/account_wizard.ui:314
 #, fuzzy
@@ -6872,11 +6690,11 @@ msgstr "Cone_ctar"
 
 #: gajim/data/gui/account_wizard.ui:318
 msgid "Sign up for a new account on a server of your choice"
-msgstr ""
+msgstr "Regístrate para obtener una nueva cuenta en un servidor de su elección"
 
 #: gajim/data/gui/account_wizard.ui:369
 msgid "Visit Website"
-msgstr ""
+msgstr "Visitar la página web"
 
 #: gajim/data/gui/account_wizard.ui:410
 msgid "Certificate Verification Failed"
@@ -6887,19 +6705,20 @@ msgid ""
 "The following warnings came up while trying to verify the server's "
 "certificate"
 msgstr ""
+"Las siguientes advertencias llegaron mientras se intentaba verificar el "
+"certificado del servidor"
 
 #: gajim/data/gui/account_wizard.ui:457
 msgid "_Show Certificate"
 msgstr "Mostrar certificado"
 
 #: gajim/data/gui/account_wizard.ui:472
-#, fuzzy
 msgid "_Add to Trusted Certificates"
-msgstr "Certificado autofirmado"
+msgstr "_Añadir a certificados de confianza"
 
 #: gajim/data/gui/account_wizard.ui:501 gajim/data/gui/account_wizard.ui:664
 msgid "Which server should I choose?"
-msgstr ""
+msgstr "¿Qué servidor debo escoger?"
 
 #: gajim/data/gui/account_wizard.ui:516
 msgid ""
@@ -6907,14 +6726,17 @@ msgid ""
 "Creating an account on one server allows you to communicate with contacts "
 "from other servers as well."
 msgstr ""
+"Hay muchos servidores para elegir.\n"
+"Crear una cuenta en un servidor también te permite comunicarte con contactos "
+"de otros servidores."
 
 #: gajim/data/gui/account_wizard.ui:530
 msgid "Visit Server's Website"
-msgstr ""
+msgstr "Visitar web del servidor"
 
 #: gajim/data/gui/account_wizard.ui:550
 msgid "Listing of Servers"
-msgstr ""
+msgstr "Listado de servidores"
 
 #: gajim/data/gui/account_wizard.ui:568
 msgid ""
@@ -6924,7 +6746,7 @@ msgstr ""
 
 #: gajim/data/gui/account_wizard.ui:586
 msgid "A Feature Comparison of Various Servers"
-msgstr ""
+msgstr "Comparativa de características de varios servidores"
 
 #: gajim/data/gui/account_wizard.ui:604
 msgid ""
@@ -6934,23 +6756,22 @@ msgstr ""
 "<a href='https://conversations.im/compliance/'>conversations.im/compliance</"
 "a>"
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Cone_ctar"
 
 #: gajim/data/gui/account_wizard.ui:646
-#, fuzzy
 msgid "_Please choose a server"
-msgstr "Por favor crea un nuevo tema desde cero con el nombre deseado."
+msgstr "_Por favor, elegir un servidor"
 
 #: gajim/data/gui/account_wizard.ui:702
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
-msgstr ""
+msgstr "Nota: las cuentas anónimas no son posibles en todos los servidores"
 
 #: gajim/data/gui/advanced_configuration.ui:39
 msgid "You should restart Gajim for some changes to take effect"
@@ -6965,17 +6786,15 @@ msgid "Type to search for values..."
 msgstr ""
 
 #: gajim/data/gui/advanced_configuration.ui:180
-#, fuzzy
 msgid "_Reset Value"
-msgstr "_Restablecer colores por defecto"
+msgstr "_Restablecer valor"
 
 #: gajim/data/gui/advanced_configuration.ui:185
-#, fuzzy
 msgid "Resets value to default"
-msgstr "_Restablecer colores por defecto"
+msgstr "_Restablecer valor por defecto"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 msgid "Hostname"
 msgstr "Nombre del host"
 
@@ -6988,13 +6807,12 @@ msgid "Server Uptime"
 msgstr "Tiempo de actividad del servidor"
 
 #: gajim/data/gui/server_info.ui:109
-#, fuzzy
 msgid "Contact Addresses"
-msgstr "Mensaje de conversación:"
+msgstr "Direcciones de contactos"
 
 #: gajim/data/gui/server_info.ui:124
 msgid "No contact addresses published for this server."
-msgstr ""
+msgstr "No hay direcciones de contactos publicados en este servidor."
 
 #: gajim/data/gui/server_info.ui:177
 msgid "Proxy Type"
@@ -7012,7 +6830,7 @@ msgstr "Ver _Certificado"
 msgid "Proxy Host"
 msgstr "Host del proxy"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Tipo"
 
@@ -7021,12 +6839,10 @@ msgid "Protocol"
 msgstr "Protocolo"
 
 #: gajim/data/gui/server_info.ui:333
-#, fuzzy
 msgid "Copy info to clipboard"
-msgstr "_Copiar la dirección del enlace"
+msgstr "Copiar información al portapapeles"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Características"
 
@@ -7068,9 +6884,8 @@ msgid "Add this certificate to the list of _trusted certificates"
 msgstr "Añadir este certificado a la lista de certificados de confianza"
 
 #: gajim/data/gui/ssl_error_dialog.ui:92
-#, fuzzy
 msgid "_Ignore this error for this certificate"
-msgstr "Ignorar este error para este certificado"
+msgstr "_Ignorar este error para este certificado"
 
 #: gajim/data/gui/ssl_error_dialog.ui:118
 msgid "_View Certificate"
@@ -7107,7 +6922,7 @@ msgstr "Ac_tividad"
 
 #: gajim/data/gui/change_status_message_dialog.ui:187
 msgid "M_ood"
-msgstr ""
+msgstr "Estado de ánimo"
 
 #: gajim/data/gui/change_status_message_dialog.ui:314
 msgid "_Type your new status message"
@@ -7130,23 +6945,20 @@ msgid "_XMPP Address"
 msgstr "Dirección _XMPP"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#, fuzzy
 msgid "_Nickname"
-msgstr "_Alias:"
+msgstr "Alias"
 
 #: gajim/data/gui/add_new_contact_window.ui:117
 msgid "_Group"
 msgstr "_Grupo"
 
 #: gajim/data/gui/add_new_contact_window.ui:165
-#, fuzzy
 msgid "Choose or type new group name"
-msgstr "Elige un grupo de tipo 'nuevo grupo'"
+msgstr "Elige o escribe un nuevo nombre de grupo"
 
 #: gajim/data/gui/add_new_contact_window.ui:181
-#, fuzzy
 msgid "A_ccount"
-msgstr "_Cuenta:"
+msgstr "_Cuenta"
 
 #: gajim/data/gui/add_new_contact_window.ui:197
 msgid "_Protocol"
@@ -7159,16 +6971,14 @@ msgid "Query Contact Info"
 msgstr "_Información"
 
 #: gajim/data/gui/add_new_contact_window.ui:314
-#, fuzzy
 msgid "A_llow contact to view my status"
-msgstr "Permitirle a este contacto ver mi estado"
+msgstr "Permitir al contacto ver mi estado"
 
 #: gajim/data/gui/add_new_contact_window.ui:365
 msgid "_Save subscription message"
 msgstr "Guardar mensaje de _suscripción"
 
 #: gajim/data/gui/add_new_contact_window.ui:391
-#, fuzzy
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
@@ -7196,6 +7006,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Cambiar mensaje de estado…"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Estado de ánimo</b>"
@@ -7226,7 +7041,7 @@ msgstr "Instalar extensión desde archivo ZIP"
 
 #: gajim/data/gui/plugins_window.ui:56
 msgid "Install from File…"
-msgstr ""
+msgstr "Instalar desde fichero…"
 
 #: gajim/data/gui/plugins_window.ui:70
 msgid "Uninstall Plugin"
@@ -7237,9 +7052,8 @@ msgid "<Plugin Name>"
 msgstr "<Plugin Name>"
 
 #: gajim/data/gui/plugins_window.ui:133
-#, fuzzy
 msgid "Plugin Settings"
-msgstr "Extensiones"
+msgstr "Configuraciones de extensiones"
 
 #: gajim/data/gui/plugins_window.ui:215
 msgid "<Description>"
@@ -7255,16 +7069,17 @@ msgstr "Autores"
 
 #: gajim/data/gui/plugins_window.ui:319
 msgid "<empty>"
-msgstr ""
+msgstr "<empty>"
 
 #: gajim/data/gui/plugins_window.ui:349
 msgid "Installed"
 msgstr "Instalado"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "La descripción de la extensión debería mostrarse aquí. Este texto se borrará "
 "mientras se inicia PluginsWindow."
@@ -7278,9 +7093,8 @@ msgid "both"
 msgstr "ambos"
 
 #: gajim/data/gui/privacy_list_window.ui:24
-#, fuzzy
 msgid "from"
-msgstr "De"
+msgstr "de"
 
 #: gajim/data/gui/privacy_list_window.ui:27
 msgid "to"
@@ -7397,9 +7211,8 @@ msgid "_Execute Command..."
 msgstr "_Ejecutar comando..."
 
 #: gajim/data/gui/account_context_menu.ui:65
-#, fuzzy
 msgid "_View Server Info"
-msgstr "Información del Servidor"
+msgstr "_Ver información de servidor"
 
 #: gajim/data/gui/manage_proxies.ui:12
 msgctxt "proxy configuration"
@@ -7412,9 +7225,8 @@ msgid "SOCKS5"
 msgstr "SOCKS5"
 
 #: gajim/data/gui/manage_proxies.ui:65
-#, fuzzy
 msgid "Add Proxy"
-msgstr "Proxy"
+msgstr "Añadir proxy"
 
 #: gajim/data/gui/manage_proxies.ui:79
 msgid "Remove Proxy"
@@ -7429,14 +7241,12 @@ msgid "Use proxy auth_entication"
 msgstr "Usar aut_entificación del proxy"
 
 #: gajim/data/gui/manage_proxies.ui:176
-#, fuzzy
 msgid "_Username"
-msgstr "_Nombre"
+msgstr "_Usuario"
 
 #: gajim/data/gui/manage_proxies.ui:237
-#, fuzzy
 msgid "_Host"
-msgstr "_Servidor"
+msgstr "_Host"
 
 #: gajim/data/gui/manage_proxies.ui:255 gajim/gtk/adhoc.py:322
 msgid "Settings"
@@ -7447,87 +7257,113 @@ msgstr "Configuraciones"
 msgid "_Name"
 msgstr "_Nombre"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 msgid "Proxy"
 msgstr "Proxy"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Iniciar conversación"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Abandonar grupos de charla"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+msgid "_History Manager"
+msgstr "Gestor de _Histórico"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Extensiones"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
-msgstr "Preferencias"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+msgid "_Preferences"
+msgstr "_Preferencias"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "Salir"
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Cuentas"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
-msgstr "Vista"
+msgid "_View"
+msgstr "_Ver"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Mostrar sólo contactos _activos"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Mostrar sólo contactos _activos"
 
 #: gajim/data/gui/application_menu.ui:54
-#, fuzzy
-msgid "Show Transports"
-msgstr "Mostrar Trans_portes"
+msgid "Show _Transports"
+msgstr "Mostrar _transportes"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
-msgstr "Consola XML"
+#: gajim/data/gui/application_menu.ui:60
+msgid "_XML Console"
+msgstr "Consola _XML"
+
+#: gajim/data/gui/application_menu.ui:64
+msgid "_File Transfer"
+msgstr "Transferencia de _fichero"
 
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
+msgid "_Help"
 msgstr "Ayuda"
 
 #: gajim/data/gui/application_menu.ui:77
-msgid "Wiki (Online)"
-msgstr "Wiki (en línea)"
+msgid "_Wiki (Online)"
+msgstr "_Wiki (en línea)"
 
 #: gajim/data/gui/application_menu.ui:81
-msgid "FAQ (Online)"
-msgstr "FAQ (en línea)"
+msgid "FA_Q (Online)"
+msgstr "FA_Q (en línea)"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
+#: gajim/data/gui/application_menu.ui:89
+msgid "_Features"
+msgstr "Características"
+
+#: gajim/data/gui/application_menu.ui:93
+msgid "_About"
+msgstr "_Acerca de"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
-msgstr ""
+msgstr "¿Público o privado?"
 
 #: gajim/data/gui/groupchat_creation.ui:42
 msgid ""
 "<b>Private:</b> If you plan to chat encrypted, you would typically want to "
 "create a private group chat. You have to invite people so they can join."
 msgstr ""
+"<b>Privado:</b> Si planeas chatear cifrado, normalmente querrás crear un "
+"chat grupal privado. Tienes que invitar a personas para que puedan unirse."
 
 #: gajim/data/gui/groupchat_creation.ui:58
 msgid "<b>Public:</b> Anyone who knows the address can join."
-msgstr ""
+msgstr "<b>Público:</b> Cualquiera que conozca la dirección se puede unir."
+
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+msgid "Create Group Chat"
+msgstr "Crear grupo de charla"
 
 #: gajim/data/gui/groupchat_creation.ui:122
 msgid "_Description"
@@ -7583,7 +7419,7 @@ msgstr "Dirección"
 
 #: gajim/data/gui/groupchat_info_scrolled.ui:49
 msgid "Topic"
-msgstr ""
+msgstr "Tema"
 
 #: gajim/data/gui/groupchat_info_scrolled.ui:65
 msgid "Author"
@@ -7594,9 +7430,8 @@ msgid "Discussion Logs"
 msgstr ""
 
 #: gajim/data/gui/groupchat_info_scrolled.ui:230
-#, fuzzy
 msgid "Group Chat Language"
-msgstr "Invitación a grupo de charla"
+msgstr "Idioma del grupo"
 
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
@@ -7608,30 +7443,26 @@ msgid "Invite Friends!"
 msgstr "¡Invitar amigos!"
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
-#, fuzzy
 msgid ""
 "You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
-"Vas a comenzar una conversación multiusuario.\n"
-"Selecciona los contactos a invitar"
+"Ahora estás entrando en un chat grupal.\n"
+"Seleccione los contactos que desea invitar."
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-#, fuzzy
 msgid "Please select a group chat server."
-msgstr "Por favor selecciona un servidor MUC."
+msgstr "Por favor, seleccionar un servidor de grupos de chat"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-#, fuzzy
 msgid "Group chat server"
-msgstr "Grupos de charla"
+msgstr "Servidor del grupo"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_vitar"
 
 #: gajim/data/gui/bookmarks.ui:176
-#, fuzzy
 msgid "Autojoin"
 msgstr "Auto conectar"
 
@@ -7678,9 +7509,8 @@ msgstr ""
 "que actualmente chateas."
 
 #: gajim/data/gui/history_manager.ui:217
-#, fuzzy
 msgid "Search database..."
-msgstr "_Buscar en la base de datos"
+msgstr "Buscar en la base de datos..."
 
 #: gajim/data/gui/history_manager.ui:232
 msgid "Search in database"
@@ -7700,14 +7530,12 @@ msgid "Send the message"
 msgstr "Enviar el mensaje"
 
 #: gajim/data/gui/shortcuts_window.ui:24
-#, fuzzy
 msgid "Add new line"
-msgstr "Crear nuevo post"
+msgstr "Añadir nueva línea"
 
 #: gajim/data/gui/shortcuts_window.ui:31
-#, fuzzy
 msgid "Select an emoji"
-msgstr "Usar _emoticonos"
+msgstr "Seleccionar un emoticono"
 
 #: gajim/data/gui/shortcuts_window.ui:38
 #, fuzzy
@@ -7715,9 +7543,8 @@ msgid "Complete a command or a nickname"
 msgstr "Por favor crea un nuevo tema desde cero con el nombre deseado."
 
 #: gajim/data/gui/shortcuts_window.ui:45
-#, fuzzy
 msgid "Previously sent message"
-msgstr "Mensajes predefinidos:"
+msgstr "Mensaje enviado previamente"
 
 #: gajim/data/gui/shortcuts_window.ui:52
 #, fuzzy
@@ -7740,17 +7567,16 @@ msgid "Clear message entry"
 msgstr "Mensaje enviado"
 
 #: gajim/data/gui/shortcuts_window.ui:81
-#, fuzzy
 msgid "Recent history"
-msgstr "Histórico"
+msgstr "Historial reciente"
 
 #: gajim/data/gui/shortcuts_window.ui:86
 msgid "Scroll up"
-msgstr ""
+msgstr "Desplazar hacia arriba"
 
 #: gajim/data/gui/shortcuts_window.ui:93
 msgid "Scroll down"
-msgstr ""
+msgstr "Desplazar hacia abajo"
 
 #: gajim/data/gui/shortcuts_window.ui:100
 msgid "Clear chat window"
@@ -7786,11 +7612,11 @@ msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:155
 msgid "Move tab to the left"
-msgstr ""
+msgstr "Mover pestaña a la izquierda"
 
 #: gajim/data/gui/shortcuts_window.ui:162
 msgid "Move tab to the right"
-msgstr ""
+msgstr "Mover pestaña a la derecha"
 
 #: gajim/data/gui/shortcuts_window.ui:169
 msgid "Close chat"
@@ -7805,54 +7631,59 @@ msgstr "Atajos de conversaciones"
 msgid "Create new group chat"
 msgstr "Crear nuevo grupo de chat"
 
-#: gajim/data/gui/shortcuts_window.ui:224
-#, fuzzy
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Extensiones"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 msgid "File transfers"
-msgstr "Transferencias"
+msgstr "Transferencias de ficheros"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr "Establecer el mensaje de estado"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 msgid "Show XML console"
 msgstr "Mostrar consola XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: gajim/data/gui/shortcuts_window.ui:258
-#, fuzzy
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Mostrar contactos desconectados"
 
-#: gajim/data/gui/shortcuts_window.ui:265
-#, fuzzy
+#: gajim/data/gui/shortcuts_window.ui:258
 msgid "Show only active contacts"
-msgstr "Mostrar sólo contactos _activos"
+msgstr "Mostrar sólo contactos activos"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
-msgstr ""
+msgstr "Habilitar filtrado de la lista de contactos"
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 msgid "Show / hide contact list"
 msgstr "Mostrar / ocultar lista de contactos"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Contactos"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr "Renombrar contacto"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "Borrar contacto"
 
@@ -7861,23 +7692,20 @@ msgid "Passphrase"
 msgstr "Contraseña"
 
 #: gajim/data/gui/history_window.ui:27
-#, fuzzy
 msgid "Display status changes"
-msgstr "_Registrar cambios de estado de los contactos"
+msgstr "Mostrar cambios de estado"
 
 #: gajim/data/gui/history_window.ui:233
 msgid "Mode"
 msgstr "Modo"
 
 #: gajim/data/gui/history_window.ui:246
-#, fuzzy
 msgid "Search complete history"
-msgstr "Histórico"
+msgstr "Buscar en todo el historial"
 
 #: gajim/data/gui/history_window.ui:263
-#, fuzzy
 msgid "Search selected day only"
-msgstr "Buscando solo en el día seleccionado"
+msgstr "Buscar solo en el día seleccionado"
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
@@ -7919,15 +7747,18 @@ msgid "Fill in the form."
 msgstr "Rellenar el formulario."
 
 #: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:40
-#, fuzzy
 msgid "Group Chat Configuration"
-msgstr "Invitación a grupo de charla"
+msgstr "Configuración del grupo"
+
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Consola XML"
 
 #: gajim/data/gui/xml_console.ui:131
 msgid "Start Search..."
 msgstr "Comenzar búsqueda..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "Filtro"
 
@@ -7970,10 +7801,6 @@ msgstr "Mostrar todos los _eventos pendientes"
 msgid "Mute Sounds"
 msgstr "Silenciar sonidos"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-msgid "_Preferences"
-msgstr "_Preferencias"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -7985,16 +7812,15 @@ msgstr "Asunto"
 
 #: gajim/data/gui/single_message_window.ui:88
 msgid "Type the subject here..."
-msgstr ""
+msgstr "Escribir el asunto aquí..."
 
 #: gajim/data/gui/single_message_window.ui:102
 msgid "_Message"
 msgstr "_Mensaje"
 
 #: gajim/data/gui/single_message_window.ui:144
-#, fuzzy
 msgid "Characters typed: 0"
-msgstr "Carácter no permitido"
+msgstr "Cáracteres: 0"
 
 #: gajim/data/gui/single_message_window.ui:189
 #, fuzzy
@@ -8079,13 +7905,13 @@ msgid "Show logged messages which mention given text"
 msgstr ""
 
 #: gajim/command_system/implementation/standard.py:96
-#, fuzzy, python-format
+#, python-format
 msgid "%s: Nothing found"
-msgstr "%s no encontrado"
+msgstr "%s: No se ha encontrado nada"
 
 #: gajim/command_system/implementation/standard.py:102
 msgid "Limit must be an integer"
-msgstr ""
+msgstr "EL límite debe ser un entero"
 
 #: gajim/command_system/implementation/standard.py:127
 msgid ""
@@ -8099,11 +7925,11 @@ msgstr ""
 
 #: gajim/command_system/implementation/standard.py:145
 msgid "Set the current status to away"
-msgstr ""
+msgstr "Establecer el estado actual a ausente"
 
 #: gajim/command_system/implementation/standard.py:159
 msgid "Set the current status to online"
-msgstr ""
+msgstr "Establecer el estado actual a conectado"
 
 #: gajim/command_system/implementation/standard.py:162
 msgid "Available"
@@ -8163,9 +7989,8 @@ msgid "Send a message to the contact that will attract their attention"
 msgstr "Enviar un mensaje al contacto"
 
 #: gajim/command_system/implementation/standard.py:269
-#, fuzzy
 msgid "Change your nickname in a group chat"
-msgstr "Cambiar tu _alias (Ctrl+N)"
+msgstr "Cambiar tu alias en un grupo"
 
 #: gajim/command_system/implementation/standard.py:274
 msgid "Invalid nickname"
@@ -8255,17 +8080,16 @@ msgid "Invalid affiliation given"
 msgstr "cambió la afiliación"
 
 #: gajim/command_system/implementation/standard.py:385
-#, fuzzy
 msgid "Display names of all group chat participants"
-msgstr "Muestra los nombres de los ocupantes del grupo de charla."
+msgstr "Muestra los nombres de los participantes del grupo de charla"
 
 #: gajim/command_system/implementation/standard.py:407
 msgid "Forbid a participant to send you public or private messages"
-msgstr ""
+msgstr "Prohibir a un participante enviarte mensajes públicos o privados"
 
 #: gajim/command_system/implementation/standard.py:412
 msgid "Allow a participant to send you public or private messages"
-msgstr ""
+msgstr "Permitir a un participante enviarte mensajes públicos o privados"
 
 #: gajim/command_system/implementation/middleware.py:76
 msgid "Error during command execution!"
@@ -8283,125 +8107,112 @@ msgstr "%(progress)s de %(total)s"
 #: gajim/gtk/filetransfer_progress.py:121
 #, python-format
 msgid "%(minutes)s min %(seconds)s sec"
-msgstr ""
+msgstr "%(minutes)s min %(seconds)s seg"
 
-#: gajim/gtk/groupchat_info.py:38
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:37
 msgid "?Group chat feature:Open"
-msgstr "Ninguno"
+msgstr "?Group chat feature:Abierto"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
 msgstr "Cualquiera se puede unir a este grupo de charla"
 
-#: gajim/gtk/groupchat_info.py:42
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:41
 msgid "?Group chat feature:Members Only"
-msgstr "Resaltado de mensaje de grupo de charla"
+msgstr "?Group chat feature:Miembros únicamente"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
-msgstr ""
+msgstr "Este grupo está restringido solo a miembros"
 
-#: gajim/gtk/groupchat_info.py:47
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:46
 msgid "?Group chat feature:Not Anonymous"
-msgstr "Grupos de charla"
+msgstr "?Group chat feature:No anónimo"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
-msgstr ""
+msgstr "Todos los participantes puede ver tu dirección XMPP"
 
-#: gajim/gtk/groupchat_info.py:52
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:51
 msgid "?Group chat feature:Semi-Anonymous"
-msgstr "Resaltado de mensaje de grupo de charla"
+msgstr "?Group chat feature:Semi-anónimo"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
-msgstr ""
+msgstr "Solo los moderadores pueden ver tu dirección XMPP"
 
-#: gajim/gtk/groupchat_info.py:56
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:55
 msgid "?Group chat feature:Moderated"
-msgstr "Ninguno"
+msgstr "?Group chat feature:Moderado"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:60
 msgid "?Group chat feature:Not Moderated"
-msgstr "Grupos de charla"
+msgstr "?Group chat feature:No moderado"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:65
 msgid "?Group chat feature:Public"
-msgstr "Resaltado de mensaje de grupo de charla"
+msgstr "?Group chat feature:Público"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:69
 msgid "?Group chat feature:Hidden"
-msgstr "Ninguno"
+msgstr "?Group chat feature:Oculto"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Este grupo de charla no tiene tema"
 
-#: gajim/gtk/groupchat_info.py:74
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:73
 msgid "?Group chat feature:Password Required"
-msgstr "Grupos de charla"
+msgstr "?Group chat feature:Contraseña requerida"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
-msgstr ""
+msgstr "Este grupo requiere de una contraseña para entrar"
 
-#: gajim/gtk/groupchat_info.py:79
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:78
 msgid "?Group chat feature:No Password Required"
-msgstr "Grupos de charla"
+msgstr "?Group chat feature:No se requiere contraseña"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
-msgstr ""
+msgstr "Este grupo no requiere de una contraseña para entrar"
 
-#: gajim/gtk/groupchat_info.py:84
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:83
 msgid "?Group chat feature:Persistent"
-msgstr "Grupos de charla"
+msgstr "?Group chat feature:Persistente"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
-msgstr ""
+msgstr "Este grupo persiste incluso si no tiene participantes"
 
-#: gajim/gtk/groupchat_info.py:89
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:88
 msgid "?Group chat feature:Temporary"
-msgstr "Ninguno"
+msgstr "?Group chat feature:Temporal"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
-msgstr ""
+msgstr "Este grupo se destruirá cuando lo abandone el último participante"
 
-#: gajim/gtk/groupchat_info.py:94
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:93
 msgid "?Group chat feature:Archiving"
-msgstr "Invitación a grupo de charla"
+msgstr "?Group chat feature:Archivado"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 msgid "Messages are archived on the server"
 msgstr "Los mensajes están archivados en el servidor"
 
@@ -8429,7 +8240,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Recipiente: "
 
@@ -8498,9 +8309,8 @@ msgstr ""
 "sobreescribirlo"
 
 #: gajim/gtk/filetransfer.py:424
-#, fuzzy
 msgid "File Transfer Conflict"
-msgstr "Transferencia del archivo finalizada"
+msgstr "Conflicto con transferencia de fichero"
 
 #: gajim/gtk/filetransfer.py:425
 msgid "File already exists"
@@ -8508,27 +8318,24 @@ msgstr "Este archivo ya existe"
 
 #: gajim/gtk/filetransfer.py:426
 msgid "Resume download or replace file?"
-msgstr ""
+msgstr "¿Reanudar descarga o sustituir fichero?"
 
 #: gajim/gtk/filetransfer.py:430
-#, fuzzy
 msgid "Resume _Download"
-msgstr "Descarga"
+msgstr "Continuar _descarga"
 
 #: gajim/gtk/filetransfer.py:433
-#, fuzzy
 msgid "Replace _File"
-msgstr "Limpiando"
+msgstr "Reemplazar _fichero"
 
 #: gajim/gtk/filetransfer.py:443
-#, fuzzy, python-format
+#, python-format
 msgid "Directory '%s' is not writable"
-msgstr "No se puede escribir en el directorio \"%s\""
+msgstr "No se puede escribir en el directorio '%s'"
 
 #: gajim/gtk/filetransfer.py:444
-#, fuzzy
 msgid "You do not have permissions to create files in this directory."
-msgstr "No tienes permisos para crear archivos en este directorio."
+msgstr "No tienes permisos para crear ficheros en este directorio."
 
 #: gajim/gtk/filetransfer.py:467
 #, python-format
@@ -8546,9 +8353,9 @@ msgid "Description: %s"
 msgstr "Descripción: %s"
 
 #: gajim/gtk/filetransfer.py:486
-#, fuzzy, python-format
+#, python-format
 msgid "%s wants to send you a file"
-msgstr "%s quiere enviarte un archivo."
+msgstr "%s quiere enviarte un fichero"
 
 #: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
@@ -8580,7 +8387,7 @@ msgstr "Archivo: "
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Remitente: "
 
@@ -8593,10 +8400,9 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
-#, fuzzy
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 msgid "Back"
-msgstr "Vuelvo pronto"
+msgstr "Volver"
 
 #: gajim/gtk/change_password.py:51
 msgid "Changing Password..."
@@ -8619,11 +8425,12 @@ msgid "Password Change Failed"
 msgstr "El cambio de contraseña ha fallado"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
@@ -8656,39 +8463,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Error SSL desconocido '%s'"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Conversación continuada"
+msgid "Start / Join Chat"
+msgstr "Iniciar conversación"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-msgid "Add Contact"
-msgstr "Añadir contacto"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
-#, fuzzy, python-format
+#: gajim/gtk/start_chat.py:802
+#, python-format
 msgid "%s group chats found"
-msgstr "%s no encontrado"
+msgstr "%s grupos encontrados"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servicio no ha respondido todavía con información detallada"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8697,33 +8500,32 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Others"
 
-#: gajim/gtk/discovery.py:129
-#, fuzzy
+#: gajim/gtk/discovery.py:130
 msgid "Group Chat"
-msgstr "_Grupos de charla"
+msgstr "Grupo de charla"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8731,141 +8533,139 @@ msgstr ""
 "No hay servicio en la dirección introducida, o no está respondiendo. "
 "Comprueba la dirección e inténtalo de nuevo."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servicio no contiene ningún elemento a navegar."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar por %(address)s usando la cuenta %(account)s"
 
-#: gajim/gtk/discovery.py:850
-#, fuzzy
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
-msgstr "_Navegar"
+msgstr "Navegar"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 msgid "_Command"
 msgstr "_Comando"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Buscar"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gajim/gtk/discovery.py:1456
-#, fuzzy, python-format
+#: gajim/gtk/discovery.py:1457
+#, python-format
 msgid "Scanning %(current)d / %(total)d ..."
-msgstr "Escaneando %(current)d / %(total)d.."
+msgstr "Escaneando %(current)d / %(total)d ..."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Usuarios"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Añadido"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Nodo"
 
-#: gajim/gtk/discovery.py:1978
-#, fuzzy
+#: gajim/gtk/discovery.py:1979
 msgid "_New post"
-msgstr "Nuevo post"
+msgstr "_Nuevo envío"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Enviar mensaje"
 
-#: gajim/gtk/single_message.py:103
-#, fuzzy
+#: gajim/gtk/single_message.py:101
 msgid "(No subject)"
-msgstr "tema"
+msgstr "(Sin asunto)"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Mensaje:"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr "Caracteres tecleados: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: gajim/gtk/single_message.py:241
-#, fuzzy, python-format
+#: gajim/gtk/single_message.py:239
+#, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
-msgstr "No es posible enviar un mensaje a %s, esta JID no es válida."
+msgstr ""
+"No es posible enviar un mensaje a %s, esta dirección XMPP no es válida."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
@@ -8903,37 +8703,18 @@ msgid "Register"
 msgstr "Registrar"
 
 #: gajim/gtk/service_registration.py:193 gajim/gtk/service_registration.py:205
-#, fuzzy
 msgid "Registration successful"
-msgstr "La cuenta ha sido registrada con éxito"
+msgstr "Registro exitoso"
 
 #: gajim/gtk/service_registration.py:216
 msgid "Registration failed"
 msgstr "Falló el registro"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "No está disponible el diccionario para el idioma %s"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Tienes que instalar el diccionario \"%s\" para usar el corrector ortográfico "
-"o elegir otro idioma ajustando la opción speller_language.\n"
-"\n"
-"No se usará el resaltado de los errores de escritura"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 msgid "Certificate"
 msgstr "Certificado"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, python-format
 msgid ""
 "Certificate for \n"
@@ -8942,77 +8723,77 @@ msgstr ""
 "Certificado para \n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
-msgstr ""
+msgstr "Emitido a\n"
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
-msgstr ""
+msgstr "Nombre común (CN):"
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
-msgstr ""
+msgstr "Organización (O):"
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
-msgstr ""
+msgstr "Unidad organizativa (OU):"
 
-#: gajim/gtk/dialogs.py:291
-#, fuzzy
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
-msgstr "Número GG:"
+msgstr "Número de serie:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
-msgstr ""
+msgstr "Emitido por:\n"
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
-msgstr ""
+msgstr "Validez\n"
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
-msgstr ""
+msgstr "Emitido el:"
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
-msgstr ""
+msgstr "Caduca el:"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr "SHA-1:"
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr "SHA-256:"
 
-#: gajim/gtk/dialogs.py:314
-#, fuzzy
+#: gajim/gtk/dialogs.py:304
 msgid "Group Chat Invitation "
-msgstr "Invitación a grupo de charla"
+msgstr "Invitación a grupo"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 "<b>%(contact)s</b> te ha invitado al grupo de charla <b>%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
 #: gajim/gtk/add_contact.py:32
-#, fuzzy
 msgid "GG Number"
-msgstr "Número GG:"
+msgstr "Número GG"
 
 #: gajim/gtk/add_contact.py:33
-#, fuzzy
 msgid "ICQ Number"
-msgstr "Número ICQ:"
+msgstr "Número ICQ"
+
+#: gajim/gtk/add_contact.py:42
+msgid "Add Contact"
+msgstr "Añadir contacto"
 
 #: gajim/gtk/add_contact.py:260
 #, python-format
@@ -9039,9 +8820,8 @@ msgid "You cannot add yourself to your contact list."
 msgstr "No puedes añadirte a tí mismo a tu roster."
 
 #: gajim/gtk/add_contact.py:305
-#, fuzzy
 msgid "Account Offline"
-msgstr "Desconectado"
+msgstr "Cuenta desconectada"
 
 #: gajim/gtk/add_contact.py:306
 msgid "Your account must be online to add new contacts."
@@ -9068,7 +8848,7 @@ msgstr "Error al agregar contacto de transporte"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9172,24 +8952,20 @@ msgid "Outgoing Nickname Color"
 msgstr "Cambiando alias"
 
 #: gajim/gtk/themes.py:121
-#, fuzzy
 msgid "Incoming Message Text Color"
-msgstr "Mens_aje entrante:"
+msgstr "Color del texto de mensaje entrante"
 
 #: gajim/gtk/themes.py:125
-#, fuzzy
 msgid "Incoming Message Text Font"
-msgstr "Mens_aje entrante:"
+msgstr "Tipografía del texto de mensaje entrante"
 
 #: gajim/gtk/themes.py:129
-#, fuzzy
 msgid "Outgoing Message Text Color"
-msgstr "Mensaje saliente:"
+msgstr "Color del texto de mensaje saliente"
 
 #: gajim/gtk/themes.py:133
-#, fuzzy
 msgid "Outgoing Message Text Font"
-msgstr "Mensaje saliente:"
+msgstr "Tipografía del texto de mensaje saliente"
 
 #: gajim/gtk/themes.py:137
 msgid "Status Message Color"
@@ -9200,14 +8976,12 @@ msgid "Status Message Font"
 msgstr "Tipografía del mensaje de estado"
 
 #: gajim/gtk/themes.py:145
-#, fuzzy
 msgid "URL Color"
-msgstr "Color"
+msgstr "Color de URL"
 
 #: gajim/gtk/themes.py:149
-#, fuzzy
 msgid "Highlight Message Color"
-msgstr "_Resaltar errores ortográficos"
+msgstr "Color de mensaje resaltado"
 
 #: gajim/gtk/themes.py:153
 #, fuzzy
@@ -9224,28 +8998,43 @@ msgstr "Contacto desconectado"
 msgid "Contact Connected Background "
 msgstr "Nombre de contacto"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+msgid "Status Online Color"
+msgstr "Color para estado conectado"
+
+#: gajim/gtk/themes.py:167
+msgid "Status Away Color"
+msgstr "Color para estado ausente"
+
+#: gajim/gtk/themes.py:170
+msgid "Status DND Color"
+msgstr "Color del estado No molestar"
+
+#: gajim/gtk/themes.py:173
+msgid "Status Offline Color"
+msgstr "Color para estado desconectado"
+
+#: gajim/gtk/themes.py:187
 msgid "Gajim Themes"
 msgstr "Temas Gajim"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
-#, fuzzy
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 msgid "Invalid Name"
-msgstr "Alias no válido"
+msgstr "Nombre no válido"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 msgid "Spaces are not allowed"
 msgstr "Espacios no permitidos"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 msgid "Do you want to delete this theme?"
 msgstr "¿Quieres borrar este tema?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
@@ -9253,12 +9042,11 @@ msgstr ""
 "Este es el tema que estás usando actualmente.\n"
 "¿Quieres borrar este tema?"
 
-#: gajim/gtk/themes.py:341
-#, fuzzy
+#: gajim/gtk/themes.py:353
 msgid "Delete Theme"
-msgstr "Activo"
+msgstr "Borrar tema"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 msgid "Remove Setting"
 msgstr "Eliminar configuración"
 
@@ -9281,10 +9069,9 @@ msgid "Error: %s"
 msgstr "Error: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Error"
 
@@ -9298,48 +9085,46 @@ msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "Abrir"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Limpiando"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
-#, fuzzy
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
-msgstr "Gestionar perfiles del Proxy"
+msgstr "Gestionar Proxies"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Ajustar al estado"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
-msgstr ""
+msgstr "Conectado"
 
-#: gajim/gtk/settings.py:630
-#, fuzzy
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Desconectado"
 
@@ -9356,9 +9141,8 @@ msgid "Account Removed"
 msgstr "Cuenta eliminada"
 
 #: gajim/gtk/remove_account.py:57
-#, fuzzy
-msgid "Your account has has been unregistered successfully."
-msgstr "Tu nueva cuenta ha sido creada con éxito"
+msgid "Your account has has been removed successfully."
+msgstr "Tu cuenta ha sido eliminada con éxito."
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
 msgid "Account Removal Failed"
@@ -9383,66 +9167,70 @@ msgid "_Unregister account from service"
 msgstr "_Registrar nueva cuenta"
 
 #: gajim/gtk/remove_account.py:217
-#, fuzzy
 msgid "Account has to be connected"
-msgstr "La cuenta \"%s\" está conectada al servidor"
+msgstr "La cuenta tiene que estar conectada"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Sincronizar historial"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "¿Qué quieres hacer?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "Un mes"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "Tres meses"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Un año"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
-msgstr ""
+msgstr "Todo"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s de %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, python-format
 msgid "Downloaded %s messages"
 msgstr "Descargados %s mensajes"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
+"Finalizada la sincronización del historial:\n"
+"%s mensajes descargados"
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:8
 msgid "A GTK XMPP client"
-msgstr "Un cliente de Jabber en GTK"
+msgstr "Cliente XMPP en GTK"
 
 #: gajim/gtk/about.py:52
 #, python-format
@@ -9462,17 +9250,15 @@ msgstr "Versión de PyGObject: %s"
 #: gajim/gtk/about.py:55
 #, python-format
 msgid "python-nbxmpp Version: %s"
-msgstr ""
+msgstr "python-nbxmpp Versión: %s"
 
 #: gajim/gtk/about.py:59
-#, fuzzy
 msgid "Current Developers"
-msgstr "Desarrolladores actuales:"
+msgstr "Desarrolladores actuales"
 
 #: gajim/gtk/about.py:60
-#, fuzzy
 msgid "Past Developers"
-msgstr "Desarrolladores anteriores:"
+msgstr "Desarrolladores anteriores"
 
 #: gajim/gtk/about.py:61
 msgid "Artists"
@@ -9480,156 +9266,137 @@ msgstr "Artistas"
 
 #: gajim/gtk/about.py:65
 msgid "Last but not least"
-msgstr ""
+msgstr "Lo último pero no menos importante"
 
 #: gajim/gtk/about.py:66
-#, fuzzy
 msgid "we would like to thank all the package maintainers."
-msgstr ""
-"Por último pero no menos importante, queremos agradecer a todos los "
-"mantenedores de paquetes."
+msgstr "queremos agradecer a todos los mantenedores de paquetes."
 
 #: gajim/gtk/about.py:67
-#, fuzzy
 msgid "Thanks"
-msgstr "Agradecido"
+msgstr "Agradecimientos"
 
 #: gajim/gtk/about.py:69
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: gajim/gtk/filechoosers.py:87
-#, fuzzy
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
-msgstr "Elige archivo a enviar..."
+msgstr "Elige fichero a enviar…"
 
-#: gajim/gtk/filechoosers.py:93
-#, fuzzy
+#: gajim/gtk/filechoosers.py:94
 msgid "Choose Avatar…"
-msgstr "Elegir Imagen"
+msgstr "Elegir Imagen…"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 msgid "PNG files"
 msgstr "Archivos PNG"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 msgid "JPEG files"
 msgstr "Archivos JPEG"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr "Archivos SVG"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Imágenes"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Elegir Archivo"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 msgid "ZIP files"
 msgstr "Archivos ZIP"
 
-#: gajim/gtk/filechoosers.py:145
-#, fuzzy
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
-msgstr "Guardar archivo como..."
+msgstr "Guardar fichero como…"
 
-#: gajim/gtk/filechoosers.py:179
-#, fuzzy
+#: gajim/gtk/filechoosers.py:180
 msgid "_Open"
-msgstr "OpenGPG"
+msgstr "Abrir"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de este grupo de conversación"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Conectado"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
 msgstr "Nombre de archivo: "
 
-#: gajim/gtk/tooltips.py:564
-#, fuzzy
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
-msgstr "Descarga"
+msgstr "?Noun:Descarga"
 
-#: gajim/gtk/tooltips.py:570
-#, fuzzy
+#: gajim/gtk/tooltips.py:549
 msgid "?Noun:Upload"
-msgstr "Subida"
+msgstr "?Noun:Carga"
 
-#: gajim/gtk/tooltips.py:577
-#, fuzzy
+#: gajim/gtk/tooltips.py:556
 msgid "?transfer type:Type: "
-msgstr "Transferencia del archivo detenida"
+msgstr "?transfer type:Tipo: "
 
-#: gajim/gtk/tooltips.py:583
-#, fuzzy
+#: gajim/gtk/tooltips.py:562
 msgid "?transfer status:Transferred: "
-msgstr "Pausada"
+msgstr "?transfer status:Transferido: "
 
-#: gajim/gtk/tooltips.py:586
-#, fuzzy
+#: gajim/gtk/tooltips.py:565
 msgid "?transfer status:Status: "
-msgstr "Pausada"
+msgstr "?transfer status:Estado: "
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Descripción: "
 
-#: gajim/gtk/tooltips.py:612
-#, fuzzy
+#: gajim/gtk/tooltips.py:591
 msgid "?transfer status:Aborted"
-msgstr "Pausada"
+msgstr "?transfer status:Abortado"
 
-#: gajim/gtk/tooltips.py:614
-#, fuzzy
+#: gajim/gtk/tooltips.py:593
 msgid "?transfer status:Completed"
-msgstr "Pausada"
+msgstr "?transfer status:Completado"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
-msgstr "Pausada"
+msgstr "?transfer status:Pausado"
 
-#: gajim/gtk/tooltips.py:619
-#, fuzzy
+#: gajim/gtk/tooltips.py:598
 msgid "?transfer status:Stalled"
-msgstr "Pausada"
+msgstr "?transfer status:Estancado"
 
-#: gajim/gtk/tooltips.py:623
-#, fuzzy
+#: gajim/gtk/tooltips.py:602
 msgid "?transfer status:Transferring"
-msgstr "Pausada"
+msgstr "?transfer status:Transfiriendo"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
-#, fuzzy
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 msgid "?transfer status:Not started"
-msgstr "Pausada"
+msgstr "?transfer status:No comenzado"
 
 #: gajim/gtk/groupchat_creation.py:101 gajim/gtk/groupchat_creation.py:103
 msgid " (optional)..."
-msgstr ""
+msgstr " (opcional)..."
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Archivo no válido"
 
 #: gajim/gtk/groupchat_creation.py:186
-#, fuzzy
 msgid "Not Connected"
-msgstr "Conectado"
+msgstr "No conectado"
 
 #: gajim/gtk/groupchat_creation.py:187
 #, fuzzy
@@ -9641,9 +9408,8 @@ msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
 #: gajim/gtk/sounds.py:73
-#, fuzzy
 msgid "Attention Message Received"
-msgstr "Primer mensaje recibido"
+msgstr "Mensaje de atención recibido"
 
 #: gajim/gtk/sounds.py:74
 msgid "First Message Received"
@@ -9677,31 +9443,29 @@ msgstr "Resaltado de mensaje de grupo de charla"
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
-#, fuzzy
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 msgid "Required"
-msgstr "Contraseña requerida"
+msgstr "Requerido"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Sí"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
 #: gajim/gtk/statusicon.py:200
-#, fuzzy
 msgid "_Change Status Message…"
-msgstr "_Cambiar mensaje de estado"
+msgstr "_Cambiar mensaje de estado…"
 
 #: gajim/gtk/statusicon.py:252
 #, python-format
@@ -9713,19 +9477,13 @@ msgstr "usando la cuenta %s"
 msgid "Hide _Contact List"
 msgstr "Invitar _Contactos"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Mostrar sólo contactos _activos"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
 #: gajim/gtk/profile.py:75
-#, fuzzy
 msgid "Retrieving profile…"
-msgstr "Recuperando perfil..."
+msgstr "Recuperando perfil…"
 
 #: gajim/gtk/profile.py:161
 msgid "Wrong date format"
@@ -9745,9 +9503,8 @@ msgid "Without a connection, you can not publish your contact information."
 msgstr "Sin una conexión no puedes publicar tu información de contacto."
 
 #: gajim/gtk/profile.py:320
-#, fuzzy
 msgid "Sending profile…"
-msgstr "Enviando perfil..."
+msgstr "Enviando perfil…"
 
 #: gajim/gtk/profile.py:337
 msgid "Information NOT published"
@@ -9765,35 +9522,30 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
-msgstr ""
+msgstr "Preferencias de archivado para %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Preferencias"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Preferencias"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "No estás conectado al servidor"
+msgid "Archiving Preferences Error"
+msgstr "_Preferencias"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "Error recibido: {}"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Preferencias"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Activado"
@@ -9804,19 +9556,19 @@ msgstr "Desactivado"
 
 #: gajim/gtk/advanced_config.py:97
 msgid "?config type:Boolean"
-msgstr ""
+msgstr "?config type:Booleano"
 
 #: gajim/gtk/advanced_config.py:98
 msgid "?config type:Integer"
-msgstr ""
+msgstr "?config type:Entero"
 
 #: gajim/gtk/advanced_config.py:99
 msgid "?config type:Text"
-msgstr ""
+msgstr "?config type:Texto"
 
 #: gajim/gtk/advanced_config.py:100
 msgid "?config type:Color"
-msgstr ""
+msgstr "?config type:Color"
 
 #: gajim/gtk/advanced_config.py:112
 #, fuzzy
@@ -9824,50 +9576,47 @@ msgid "?config:Preference Name"
 msgstr "Nombre de la opción"
 
 #: gajim/gtk/advanced_config.py:123
-#, fuzzy
 msgid "?config:Value"
-msgstr "_Configurar"
+msgstr "?config:Valor"
 
 #: gajim/gtk/advanced_config.py:132
 msgid "?config:Type"
-msgstr ""
+msgstr "?config:Tipo"
 
 #: gajim/gtk/advanced_config.py:187
-#, fuzzy
 msgid "?config description:None"
-msgstr "Ninguna"
+msgstr "?config description:Ninguna"
 
 #: gajim/gtk/advanced_config.py:322
-#, fuzzy
 msgid "?password:Hidden"
-msgstr "Contraseña: "
+msgstr "?password:Oculta"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
-msgstr ""
+msgstr "Soporte"
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr "Seguridad"
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
-msgstr ""
+msgstr "Comentarios"
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
-msgstr ""
+msgstr "Abuso"
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
-msgstr ""
+msgstr "Ventas"
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s días, %(hours)s horas"
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 msgid ""
 "\n"
 "Disabled in preferences"
@@ -9875,30 +9624,29 @@ msgstr ""
 "\n"
 "Deshabilitado en las preferencias"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Audio / Vídeo"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Capacidad para iniciar el chat de audio y vídeo."
 
-#: gajim/gtk/features.py:104
-#, fuzzy
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
-"Requiere gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav y "
-"gstreamer1.0-plugins-ugly."
+"Requiere: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav y "
+"gstreamer1.0-plugins-ugly"
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
 msgstr "Característica no disponible en Windows"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -9906,72 +9654,70 @@ msgid ""
 msgstr ""
 "Posibilidad de medir el tiempo de inactividad para definir el auto-estado."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr "Requiere: libxss"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
-#, fuzzy
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
-msgstr "Bonjour / Zeroconf"
+msgstr "Bonjour / Zeroconf (Chat sin servidor)"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr "Charla sin servidor con clientes autodetectados en una red local."
 
-#: gajim/gtk/features.py:119
-#, fuzzy
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
-msgstr "Requiere gir1.2-gupnpigd-1.0."
+msgstr "Requiere: gir1.2-avahi-0.6"
 
-#: gajim/gtk/features.py:120
-#, fuzzy, python-format
+#: gajim/gtk/features.py:109
+#, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
-msgstr "Requiere pybonjour y bonjour SDK en ejecución (%(url)s)"
+msgstr "Requiere: SDK de pybonjour y bonjour en ejecución (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 msgid "Location detection"
 msgstr "Detección de ubicación"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 msgid "Requires: geoclue"
 msgstr "Requiere: geoclue"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 msgid "Feature is not available under Windows"
 msgstr "Característica no disponible en Windows"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 msgid "Notification Sounds"
 msgstr "Sonidos de notificaciones"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Habilita a Gajim para reproducir sonidos para varias notificaciones"
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 msgid "Requires: gsound"
 msgstr "Requiere: gsound"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Guardar contraseña"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
@@ -9979,34 +9725,31 @@ msgid ""
 msgstr ""
 "Las contraseñas se pueden guardar de forma segura y no sólo en texto plano."
 
-#: gajim/gtk/features.py:140
-#, fuzzy
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
-"Requiere libsecret y un proveedor (como GNOME Keyring y KSecretService)."
+#: gajim/gtk/features.py:129
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Requiere: gnome-keyring o kwallet"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Corrector ortográfico"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr "Requiere: Gspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 #, fuzzy
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
@@ -10014,15 +9757,13 @@ msgstr ""
 "Capacidad de solicitar que su enrutador reenvíe el puerto para la "
 "transferencia de archivos."
 
-#: gajim/gtk/features.py:156
-#, fuzzy
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
-msgstr "Requiere gir1.2-gupnpigd-1.0."
+msgstr "Requiere: gir1.2-gupnpigd-1.0"
 
-#: gajim/gtk/features.py:217
-#, fuzzy
+#: gajim/gtk/features.py:200
 msgid "Disabled in Preferences"
-msgstr "_Preferencias"
+msgstr "Deshabilitado en preferencias"
 
 #: gajim/gtk/privacy_list.py:53
 #, python-format
@@ -10065,7 +9806,7 @@ msgstr "Nombre de lista no válido"
 msgid "You must enter a name to create a privacy list."
 msgstr "Debes introducir un nombre para crear una una lista de privacidad."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 msgid "Invite New Contact"
 msgstr "Invitar a nuevo contacto"
 
@@ -10092,7 +9833,7 @@ msgstr "_Finalizar"
 msgid "Commands"
 msgstr "Comandos"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr "Siguiente"
 
@@ -10101,9 +9842,8 @@ msgid "Previous"
 msgstr "Anterior"
 
 #: gajim/gtk/adhoc.py:116
-#, fuzzy
 msgid "Execute"
-msgstr "_Ejecutar comando"
+msgstr "Ejecutar"
 
 #: gajim/gtk/adhoc.py:196
 #, fuzzy
@@ -10116,9 +9856,8 @@ msgid "Request Command List"
 msgstr "_Ejecutar comando"
 
 #: gajim/gtk/adhoc.py:260
-#, fuzzy
 msgid "Executing…"
-msgstr "_Ejecutar comando"
+msgstr "Ejecutando…"
 
 #: gajim/gtk/adhoc.py:267
 msgid "Command List"
@@ -10160,117 +9899,126 @@ msgstr "Petición de adición de %s"
 msgid "Loading"
 msgstr "Cargando"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 msgid "Connect"
 msgstr "Conectar"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Conectar"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 msgid "Creating Account..."
 msgstr "Creando cuenta..."
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 msgid "Trying to create account..."
 msgstr "Intentando crear la cuenta..."
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Tu servidor no soporta vCard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Espacios no permitidos"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Tu servidor no soporta vCard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
-#, fuzzy
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
-#, fuzzy
+#: gajim/gtk/account_wizard.py:454
 msgid "Account is being created"
-msgstr "La cuenta \"%s\" está conectada al servidor"
+msgstr "La cuenta se está creando"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 msgid "Create New Account"
 msgstr "Crear nueva cuenta"
 
-#: gajim/gtk/account_wizard.py:622
-#, fuzzy
+#: gajim/gtk/account_wizard.py:687
 msgid "Must be a port number"
-msgstr "El puerto personalizado debe ser un número de puerto"
+msgstr "Debe ser un número de puerto"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
-msgstr ""
+msgstr "El puerto debe ser un número entre 0 y 65535"
 
-#: gajim/gtk/account_wizard.py:666
-#, fuzzy
+#: gajim/gtk/account_wizard.py:731
 msgid "Advanced settings"
-msgstr "Acciones A_vanzadas"
+msgstr "Configuración avanzada"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Error TLS desconocido '%s'"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 msgid "Create Account"
 msgstr "Crear cuenta"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
-msgstr ""
+msgstr "Redireccionar"
 
-#: gajim/gtk/account_wizard.py:823
-#, fuzzy
+#: gajim/gtk/account_wizard.py:895
 msgid "Register on the Website"
-msgstr "Registrar a %s"
+msgstr "Registrar en el sitio web"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 msgid "Account Added"
 msgstr "Cuenta añadida"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
 #: gajim/gtk/xml_console.py:170
-#, fuzzy, python-format
+#, python-format
 msgid "Please make sure you are connected with '%s'."
-msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
+msgstr "Por favor, asegúrate de estar conectado con '%s'."
 
 #: gajim/gtk/xml_console.py:180
 #, fuzzy
@@ -10282,9 +10030,8 @@ msgid "Search"
 msgstr "Buscar"
 
 #: gajim/gtk/search.py:101
-#, fuzzy
 msgid "New Search"
-msgstr "Buscar"
+msgstr "Nueva búsqueda"
 
 #: gajim/gtk/search.py:176
 msgid "Request Search Form"
@@ -10303,249 +10050,244 @@ msgstr "Resultado de la busqueda"
 msgid "No results found"
 msgstr "Sin resultados"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Por defecto"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
+"<span color=\"red\" font-weight=\"bold\">No disponible</span>, se "
+"deshabilitará el soporte de vídeo"
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
-msgstr ""
+msgstr "<span color=\"green\" font-weight=\"bold\">OpenGL</span> acelerado"
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
-msgstr ""
+msgstr "<span color=\"yellow\" font-weight=\"bold\">Desacelerado</span>"
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "¿Reconectar ahora?"
 
-#: gajim/gtk/accounts.py:120
-#, fuzzy
+#: gajim/gtk/accounts.py:123
 msgid "Re-Login now?"
 msgstr "¿Reconectar ahora?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Si quieres que se apliquen todos los cambios instantáneamente, debes "
 "reconectar."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 #, fuzzy
 msgid "_Later"
 msgstr "_Últimos"
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
-#, fuzzy
+#: gajim/gtk/accounts.py:492
 msgid "Please check if Bonjour is installed."
-msgstr "Por favor, comprueba si Avahi o Bonjour están instalados."
+msgstr "Por favor, comprueba si Bonjour está instalado."
 
-#: gajim/gtk/accounts.py:485
-#, fuzzy
+#: gajim/gtk/accounts.py:494
 msgid "Please check if Avahi is installed."
-msgstr "Por favor, comprueba si Avahi o Bonjour están instalados."
+msgstr "Por favor, comprueba si Avahi está instalado."
 
-#: gajim/gtk/accounts.py:520
-#, fuzzy
+#: gajim/gtk/accounts.py:533
 msgid "Disable Account"
-msgstr "Nombre de cuenta no válido"
+msgstr "Deshabilitar cuenta"
 
-#: gajim/gtk/accounts.py:521
-#, fuzzy, python-format
+#: gajim/gtk/accounts.py:534
+#, python-format
 msgid "Account %s is still connected"
-msgstr "La cuenta \"%s\" está conectada al servidor"
+msgstr "La cuenta %s está todavía conectada"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Todas las ventanas de conversaciones y grupos de charla serán cerradas."
 
-#: gajim/gtk/accounts.py:526
-#, fuzzy
+#: gajim/gtk/accounts.py:539
 msgid "_Disable Account"
-msgstr "Nombre de cuenta no válido"
+msgstr "_Deshabilitar cuenta"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
-msgstr ""
+msgstr "Etiqueta"
+
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr "Reconocer tu cuenta por color"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "Importar contactos"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Certificado autofirmado"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onectar al inicio de Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Grabar conversaciones para todos los contactos"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
-#, fuzzy
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 msgid "Global Status"
-msgstr "Todos los estados"
+msgstr "Estado global"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Usar proxies para las transferencias de archivo"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Inactivo desde:"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
-#, fuzzy
+#: gajim/gtk/accounts.py:663
 msgid "Client / Operating System"
-msgstr "Certificado autofirmado"
+msgstr "Cliente / Sistema operativo"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
 "estás usando"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Invitar _Contactos"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr "Prioridad"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_usar variable de entorno HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:704
-#, fuzzy
+#: gajim/gtk/accounts.py:723
 msgid "Synchronize the status of all accounts"
-msgstr "Cambia el estado de una o varias cuentas"
+msgstr "Sincronizar el estado de todas las cuentas"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Nombre:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Apellido(s):"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Nuevo correo-e"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Ajustar al estado"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Activar"
 
-#: gajim/gtk/accounts.py:778
-#, fuzzy
+#: gajim/gtk/accounts.py:797
 msgid "Port"
-msgstr "_Puerto:"
+msgstr "Puerto"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Conexión"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+msgid "Client Certificate"
+msgstr "Certificado de cliente"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
-msgstr ""
+msgstr "Archivos PKCS12"
 
-#: gajim/gtk/accounts.py:800
-#, fuzzy
+#: gajim/gtk/accounts.py:819
 msgid "Encrypted Certificate"
-msgstr "Certificado autofirmado"
+msgstr "Certificado cifrado"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Notificaciones"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 msgid "Save Password"
 msgstr "Guardar contraseña"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Extensiones"
@@ -10581,7 +10323,7 @@ msgid "Groups"
 msgstr "Grupos"
 
 #: gajim/gtk/roster_item_exchange.py:196
-#, fuzzy, python-format
+#, python-format
 msgid "%s suggested me to add you to my contact list."
 msgstr "%s me sugirió añadirte en mi roster."
 
@@ -10599,19 +10341,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Se eliminó %d contacto"
 msgstr[1] "Se eliminó %d contactos"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Artista desconocido"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Título desconocido"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Recurso desconocido"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10625,21 +10367,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Marcadores para %s"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "Archivo vacío"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "El servicio envió información malformada"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "La extensión ya existe"
@@ -10650,12 +10392,12 @@ msgstr ""
 
 #: gajim/plugins/gui.py:85
 msgid "Plugin"
-msgstr ""
+msgstr "Extensión"
 
 #: gajim/plugins/gui.py:160
-#, fuzzy, python-format
+#, python-format
 msgid "Warning: %s"
-msgstr "Expulsando a %s"
+msgstr "Advertencia: %s"
 
 #: gajim/plugins/gui.py:218
 msgid "Plugin failed"
@@ -10666,9 +10408,8 @@ msgid "Unable to properly remove the plugin"
 msgstr "No se puede eliminar correctamente el complemento"
 
 #: gajim/plugins/gui.py:287
-#, fuzzy
 msgid "Overwrite Plugin?"
-msgstr "¿Sobreescribir?"
+msgstr "¿Sobrescribir extensión?"
 
 #: gajim/plugins/gui.py:289
 #, fuzzy
@@ -10686,130 +10427,248 @@ msgstr ""
 #: data/org.gajim.Gajim.desktop.in:11 data/org.gajim.Gajim.desktop.in:23
 #: data/org.gajim.Gajim.desktop.in:29
 msgid "org.gajim.Gajim"
-msgstr ""
+msgstr "org.gajim.Gajim"
 
 #: data/org.gajim.Gajim.desktop.in:27
-#, fuzzy
 msgid "Show next pending event"
-msgstr "Mostrar todos los _eventos pendientes"
+msgstr "Mostrar siguiente evento pendiente"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 msgid "Features:"
 msgstr "Características:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
-msgstr ""
+msgstr "Invita a amigos a los grupos o únete a uno"
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr "Corrección ortográfica automática de tus mensajes"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
-msgstr ""
+msgstr "Soporta múltiples cuentas"
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
-msgstr ""
+msgstr "Mensajería sin servidor (Bonjour/Zeroconf)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
-msgstr "Descubrir servicios incluyendo nodos, búsqueda de usuarios"
+msgstr "Descubrir servicios incluyendo nodos y búsqueda de usuarios"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
-msgstr "Otras características a través de extensiones"
+msgstr "Incluso más funciones a través de extensiones"
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 msgid "Contact list"
 msgstr "Lista de contactos"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Grupos de charla"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Chat history"
 msgstr "Histórico de conversación"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 msgid "Plugin manager"
 msgstr "Administrador de extensiones"
 
+#~ msgid "Start New Conversation"
+#~ msgstr "Comenzar nueva conversación"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "Simular pérdida de conectividad"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "Simular recuperación de conectividad"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Error SSL desconocido: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "Requiere: libsecret y un proveedor (como GNOME Keyring y KSecretService)"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Elige intervalo entre 2 comprobaciones de inactividad."
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "No está disponible el diccionario para el idioma \"%s\""
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Tienes que instalar el diccionario \"%s\" para usar el corrector "
+#~ "ortográfico o elegir otro idioma ajustando la opción speller_language.\n"
+#~ "\n"
+#~ "No se usará el resaltado de los errores de escritura"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Reconectar"
+
+#~ msgid "Quit"
+#~ msgstr "Salir"
+
+#~ msgid "Show Contact List"
+#~ msgstr "Mostrar lista de contactos"
+
+#~ msgid "Add to Contact List"
+#~ msgstr "Añadir a la lista de contactos"
+
+#~ msgid "Invite Contact"
+#~ msgstr "Invitar contacto"
+
+#~ msgid "Configure Group Chat"
+#~ msgstr "Configurar grupos de charla"
+
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Destruir grupo de chat"
+
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Si está habilitado, Gajim mostrará un icono en cada pestaña que contiene "
+#~ "mensajes no leídos. Dependiendo del tema, este icono puede estar animado."
+
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "Mostrar _avatar en la pestañas de las conversaciones"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Carácter no válido en el nombre del host."
+
+#~ msgid "Server address required."
+#~ msgstr "Se requiere la dirección del servidor."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Caracter no válido en el nombre de usuario."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Carácter no válido en el recurso."
+
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Color de la notificación de los contactos que se conecten."
+
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Color de notificación de los contactos que se desconecten."
+
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Color de la notificación para notificación de nuevo mensaje."
+
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "Color de la notificación de petición de transferencia de fichero."
+
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "Color de notificación de errores en transferencia de fichero."
+
+#~ msgid "Notification color for stopped or completed file transfers."
+#~ msgstr ""
+#~ "Color de notificación para transferencia de ficheros terminadas o "
+#~ "detenidas."
+
+#~ msgid "Notification color for group chat invitations."
+#~ msgstr "Color de notificación para invitaciones a grupos."
+
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Color de fondo para la notificación de estado cambiado."
+
+#~ msgid "Notification color for other dialogs."
+#~ msgstr "Color de notificación para otros diálogos."
+
+#~ msgid "Event Type"
+#~ msgstr "Tipo de evento"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Eventos"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "No estás conectado al servidor"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Conflicto en el recurso"
 
@@ -11441,9 +11300,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Enviar mensaje privado"
 
-#~ msgid "Send _File"
-#~ msgstr "Enviar archivo"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Participantes"
@@ -14144,9 +14000,6 @@ msgstr "Administrador de extensiones"
 #~ "Podrías considerar cambiar aspectos posibles de la configuración del "
 #~ "firewall."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Combinar las cuentas"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP no es usable en este ordenador"
 
@@ -14939,9 +14792,6 @@ msgstr "Administrador de extensiones"
 #~ msgstr ""
 #~ "La sesión de Gajim se guarda al desconectar y se restaura al conectar."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Requiere gnome-keyring y python-gnome2-desktop, o kwalletcli."
-
 #~ msgid "Ability to connect to servers which are using SRV records."
 #~ msgstr "Posibilidad de conectar a servidores que usen registros SRV"
 
diff --git a/po/eu.po b/po/eu.po
index e41ef430d..455f3bb06 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Urtzi  <>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -19,77 +19,83 @@ msgstr ""
 "X-Rosetta-Version: 0.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Kontuak"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Aukeratu Irudia"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "E_z galdetu berriro  "
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Debekatze Zerrenda"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Debekatzen %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Jarraitu"
 
@@ -158,502 +164,497 @@ msgstr ""
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Bidali _Mezu Bakarra"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Komandoa Exekutatu..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportea"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Berrrizenpetu"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Ezabatu"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Bidali _Fitxeroa"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Gorde Bezala..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Gorde Bezala..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Azken egoera: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Kontaktua"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Txat Pribatua"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Historiala"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Sortzen"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Egoera Guztiak"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Kontaktua"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Txat Taldea Berria"
+msgid "Rename…"
+msgstr "_Berrrizenpetu"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Aldatu _Gaia"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Txat Taldea Berria"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Aukeratu Irudia"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Txat Taldea Berria"
+msgid "Configure…"
+msgstr "_Jarraitu"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Deskribapena: %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Ezarritako egoerak:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Aldatu _Izengoitia"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Ahotsa"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Komandoa Exekutatu..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i egun lehenago"
 msgstr[1] "%i egun lehenago"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Sortzen"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Egoera Guztiak"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "fitxeroa"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Bidali _Mezu Bakarra"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Zerbitzaria"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Hobespenak"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Debekatutako Zerrenda"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Talde Agendan Sartu Gela hau"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Gelaren Konfigurazioa"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Bidali Zerbitzarira Mezua"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Ezarri MOTD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "MOTD Gaurkotu"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Ezabatu MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Kontua E_raldatu"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Kontua E_raldatu"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Kontuak"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopiatu JID/Email-a"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Txat Taldean Sartu"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Kontaktua Gehitu..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Lotura kokapena kopiatu"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Web-ean _Ireki Lotura"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiatu JID/Email-a"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Ireki E-posta Konposatzailea"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Lotura kokapena kopiatu"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Kontu Eraldaketa"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopiatu JID/Email-a"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Honera gonbidatu"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Bota"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Debekatu"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Jabea"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Partaidea"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Partaidea"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Ahotsa"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Gela:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "mezua"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Emoticonoak:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM Hebidea:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -661,28 +662,28 @@ msgstr "Data"
 msgid "Nickname"
 msgstr "Izengoitia"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mezua"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Gaia"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "logs-en datu basea sortzen"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -695,287 +696,292 @@ msgstr ""
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Garbitu"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Zu"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s-ean esan du: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Kontaktuaren Informazioa"
 msgstr[1] "Kontaktuaren Informazioa"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 msgstr[1] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Berezko Egoera Mezuak"
 msgstr[1] "Berezko Egoera Mezuak"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 msgstr[1] "Ziur al zaude hautaturiko mezuak ezabatu nahi dituzula?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Orokorra"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Taldea"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Taldean"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ezarri MOTD"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ezer ez"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Egoera Mezua"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Egoera Mezua"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Gorde Ezarritako Bezala...."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "daukadanean"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Egoera"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Izena"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Bidali _Fitxeroa"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Gorde Bezala..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Fitxero Baliogabea"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Botatzen %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Debekatutako Zerrenda"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Honako gela honek ez du existitzen."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Txat Taldeak"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Txat Taldeak"
@@ -990,7 +996,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Avahi error"
@@ -1019,22 +1025,22 @@ msgstr "Zure kontu berria egoki sortua izan da."
 msgid "Failed to Configure Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s orain dago %(status)s"
@@ -1159,81 +1165,81 @@ msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Bidali eta Itxi"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Bidali eta Itxi"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1242,191 +1248,182 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Tamaina: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Onartu"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Deskonektatuta"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Ireki Fitxeroaren Edukia"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Konfigurazio Aurreratuaren Editorea"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Gelaren Konfigurazioa"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Elkarrizketa Hasi"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transportea"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Txat Taldeak"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "\"%s\" harpidetza onartzen baduzu bere egoera ikus ahal izango duzu."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
@@ -1436,7 +1433,7 @@ msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 msgid "desynced"
 msgstr "Aurreratua"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1456,7 +1453,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "At_era"
@@ -1605,8 +1603,8 @@ msgstr "Berrrizenpetu Taldea"
 msgid "Please enter a new name"
 msgstr "Mezu berria sortu"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "_Berrizenpetu"
@@ -1625,27 +1623,32 @@ msgstr "Ezabatu nahi al duzu %s taldea zerrendatik?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Txat Taldea Berria"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Ezabatu nahi al duzu %s taldea zerrendatik?"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1655,22 +1658,22 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Kontaktu hau ezabatu ondoren nire egoera jakitea nahi dut"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1682,25 +1685,25 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1709,12 +1712,12 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1725,126 +1728,126 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Inaktiboa"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "%s fitxero bat bidali nahi dizu:"
 msgstr[1] "%s fitxero bat bidali nahi dizu:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Bidali"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Bidali %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Egin %s eta %s metacontacts"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Argitaratu"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editatu _Taldeak"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Ezabatu"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "Kontaktua Deskonektatuta"
+msgid "Execute command"
+msgstr "_Komandoa Exekutatu..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historiala"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Begiratzaileak"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1972,224 +1975,224 @@ msgstr "Txat Pribatuak"
 msgid "Messages"
 msgstr "Mezuak"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Autorizazioa bidalia izan da"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Autorizazioa bidalia izan da"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ezer ez"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Harpidetza Eskaria"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Harpidetza Eskaria"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Harpidetza ezabat_u"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Gela honetan ukatua izan zara."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Baliogabeko izena"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Konektatu"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2197,20 +2200,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Konektatzen"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2411,11 +2414,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ez zaude gela honetan \"%s\"jadanik edo \"%s\" joan da."
@@ -2744,78 +2747,73 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Deskribapena: %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "D-Bus bertsioa aurkitugabea: %s"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Mezu Berria %(nickname)s -etik"
 msgstr[1] "Mezu Berria %(nickname)s -etik"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Txat Taldea Berria"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Egoera Aldatu du"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Konektatuta"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Deskonektatuta"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
@@ -2881,65 +2879,23 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Jakinarazi kontaktuek hau egitean: "
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Jakinarazi kontaktuek hau egitean: "
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "_Ikusarazi gertaera zerrendan"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Jakinarazi  fitxeroa transferitu denean"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Jakinarazi  fitxeroa transferitu denean"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Zuzentzaileak erabiltzen duen hizkuntza"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2949,15 +2905,15 @@ msgstr ""
 "'sometimes' - inprimatu ordua print_ichat_every_foo_minutes minutuko.\n"
 "'never' - inoiz ez inprimatu ordua."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2965,7 +2921,7 @@ msgid ""
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2974,7 +2930,7 @@ msgstr ""
 "Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
 "erabiltzen bada."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2983,17 +2939,17 @@ msgstr ""
 "Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
 "beste pertsona batek izengoiti berbera badu."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -3001,52 +2957,52 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
 msgstr "Zenbat lerro gogoarazteko lehengo elkarrizketatik leihoa irikitzean."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
 "ICQ Client default behaviour)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3055,11 +3011,11 @@ msgstr ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3068,21 +3024,21 @@ msgstr ""
 "Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
 "imprimatu x minuturo."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3091,32 +3047,32 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC estandarrak esaten du KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Jakin arazi gertaerak system trayicon-ean."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3124,7 +3080,7 @@ msgid ""
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3134,22 +3090,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
-"mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3158,12 +3105,12 @@ msgstr ""
 "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
 "kontaktuaren izenaren azpian azalduko dira."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3172,26 +3119,26 @@ msgstr ""
 "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
 "aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "ez erakutsi zerrenda sistemako zeregin barran."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3201,7 +3148,7 @@ msgstr ""
 "badira, make the window flash (the default behaviour in most Window "
 "Managers) when holding pending events."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3221,7 +3168,7 @@ msgstr ""
 "konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi "
 "behar da."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3229,32 +3176,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko. "
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Egia bada, ateratzeko botoila sakatzean tab/leihoa itxiko da."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3263,19 +3210,19 @@ msgstr ""
 "Elkarrizketa batean, bakarrik lerroaren hasieran izengoitia erakutsi  ez "
 "denean lehengo mezuan hitz egiten ari zinen pertsona bera. "
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickame."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3284,7 +3231,7 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3293,7 +3240,7 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3304,154 +3251,146 @@ msgstr ""
 "lehentasun negatiboarekin konektatzean, EZ duzu mezurik jasoko "
 "zerbitzariarengandik. "
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3460,7 +3399,7 @@ msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3469,28 +3408,32 @@ msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_Talde Agendan Sartu Gela hau"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3499,62 +3442,62 @@ msgstr ""
 "Lehentasuna zure egoeraren arabera aldatuko da. Lehentasunak autopriority_* "
 "aukeran ezarriak daude."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko. "
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3563,33 +3506,33 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3598,28 +3541,24 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3628,41 +3567,41 @@ msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3671,91 +3610,91 @@ msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Jaten"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Lanean ari naiz."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Filmea"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Lanean"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "kanpoan"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Libre."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Be right back."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Agur!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3764,1129 +3703,1129 @@ msgstr ""
 "Soinua bat entzun MUC-ak muc_highlight_words-eko hitz bat agertzean edota "
 "gela bateko mezu batek zure izengoitia duenean."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Norentzat"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Inor ez"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Txat Taldeak"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Txat Taldea"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Txat Taldeak"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Inor ez"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Gela sortzea mugatua dago."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Txat Taldea Berria"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Hau ez da txat talde bat"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Kontu izena jadanik badago"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Honako gela honek ez du existitzen."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Txat Taldeak"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host okerra"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cleaning"
 msgstr "Arratsaldea"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cooking"
 msgstr "Sortzen"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Gardening"
 msgstr "Goiza"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "talde hontakoak"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "Lanean"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 #, fuzzy
 msgid "Dancing"
 msgstr "Arratsaldea"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "Botatzen %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 #, fuzzy
 msgid "Jogging"
 msgstr "_Sartu"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 #, fuzzy
 msgid "Skiing"
 msgstr "Lanean"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "Lanean"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Shaving"
 msgstr "Jaten"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inaktiboa"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Gaia Aldatu"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Hiding"
 msgstr "Botatzen %s"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Praying"
 msgstr "Jaten"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Thinking"
 msgstr "Lanean"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Fishing"
 msgstr "Botatzen %s"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 #, fuzzy
 msgid "Gaming"
 msgstr "Jaten"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "_Deskonektatuta"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Partying"
 msgstr "Jaten"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "Arrazoia"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Arrazoia"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 #, fuzzy
 msgid "Shopping"
 msgstr "Lotan"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 #, fuzzy
 msgid "Smoking"
 msgstr "Lanean"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Jaten"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Filma bat ikustean ari naiz."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "Jaten"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 #, fuzzy
 msgid "On the Phone"
 msgstr "Telefonoan nago."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Traveling"
 msgstr "Tranferitzen"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Commuting"
 msgstr "Sortzen"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "On a Train"
 msgstr "Ireki _lotura bezala"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Walking"
 msgstr "Lanean"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 #, fuzzy
 msgid "Coding"
 msgstr "Sortzen"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "Lanean"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 #, fuzzy
 msgid "Aroused"
 msgstr "Etena"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Bored"
 msgstr "Negrita"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 #, fuzzy
 msgid "Brave"
 msgstr "daukadanean"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 #, fuzzy
 msgid "Cautious"
 msgstr "Txat-ak"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Cold"
 msgstr "Negrita"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 #, fuzzy
 msgid "Confident"
 msgstr "_Edukiak"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Contemplative"
 msgstr "Osatua"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Contented"
 msgstr "_Edukiak"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 #, fuzzy
 msgid "Creative"
 msgstr "Inaktiboa"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 #, fuzzy
 msgid "Dejected"
 msgstr "Ezabatu"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "Disappointed"
 msgstr "Ezindu"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "Dismayed"
 msgstr "Ezindu"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "Distracted"
 msgstr "Ezindu"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Taldea"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "Hot"
 msgstr "_Host-a"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "mezua"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Invincible"
 msgstr "Ikusezin"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Lonely"
 msgstr "bat"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Lost"
 msgstr "_Host-a"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "Mean"
 msgstr "Alemaniera"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Moody"
 msgstr "_Eraldatu"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "Offended"
 msgstr "Deskonektatuta"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Proud"
 msgstr "Taldea"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "hamaika"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 #, fuzzy
 msgid "Sad"
 msgstr "Stalled"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 #, fuzzy
 msgid "Satisfied"
 msgstr "Azken Eraldaketa:"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Sick"
 msgstr "Izengoitia"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Sleepy"
 msgstr "Lotan"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Stressed"
 msgstr "Kalea:"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Surprised"
 msgstr "Harpidetu"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 #, fuzzy
 msgid "Tired"
 msgstr "Denbora"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 #, fuzzy
 msgid "Undefined"
 msgstr "bederatzi"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "Berezkoa"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "arrantzale"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Botatzen %s"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Estatua:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Kontua"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Deskribapena"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Avahi error"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "bat"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 #, fuzzy
 msgid "room"
 msgstr "-etik"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Baliogabeko izena"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Pasa-esaldia Behar da"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorizazioa baimendua"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Pasa-esaldia Behar da"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Enkriptazioa aktibatuta"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4948,12 +4887,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Gelaren Konfigurazioa"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4965,294 +4904,253 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Baliogabeko karakterea hostname -ean."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Zerbitzariaren helbidea behar da."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Baliogabeko karakterea izenean."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Invalid character in resource."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Gelditua"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Gelditua"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Kanpoan"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Norentzat"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "-etik"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Biak"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Aurkitu gabea"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Partaideak"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Partaidea"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Inor ez"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Jabea"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Jabea"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administratzailea"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administratzailea"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Partaidea"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Partaidea"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "mezu bat sortzen ari da..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bidali mezua"
 msgstr[1] "Bidali mezua"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "Txat Taldean _Sartu"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "-etik"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
@@ -5354,91 +5252,91 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "Fitxeroaren tokia"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 #, fuzzy
 msgid "File does not exist"
 msgstr "Honako gela honek ez du existitzen."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 #, fuzzy
 msgid "Change status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre Hitz Egiteko"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 #, fuzzy
 msgid "Online"
 msgstr "bederatzi"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ez nahasi."
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 #, fuzzy
 msgid "Presence description:"
 msgstr "Deskripzio errorea...."
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktua"
@@ -5463,7 +5361,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Kontua"
 
@@ -5474,7 +5372,7 @@ msgstr "Txat Taldeak"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Pasahitza:"
@@ -5498,7 +5396,7 @@ msgstr "Txat Taldean _Sartu"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Sartu"
@@ -5516,17 +5414,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
@@ -5675,7 +5573,7 @@ msgstr "Kontaktuaren Informazioa"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Deskribapena"
 
@@ -5883,39 +5781,44 @@ msgstr "Lana"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "About"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Txat Taldean Sartu"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Laster etorriko naiz"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Sartu"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "%s kontua ezabatzen"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5990,6 +5893,7 @@ msgid "Strike"
 msgstr "Izengoitia"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr ""
 
@@ -6003,135 +5907,130 @@ msgstr "_Mota:"
 msgid "Clear formatting"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Debekatzen..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Izengoitiaren on_doren:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Aldatu _Izengoitia"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Aldatu _Gaia"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Sartu pasahitz berria:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Akats bat gertatu da:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Partaidea"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Bota"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Partaidea"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Debekatu"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Txat Taldea Berria"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Deskribapena: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Arrazoia"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Honera gonbidatu"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Gertaera"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Gertaerak"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6229,20 +6128,20 @@ msgid "Add"
 msgstr "Gehitu"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Ezabatu"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Baliabidea:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Egoera"
 
@@ -6252,7 +6151,7 @@ msgid "Client"
 msgstr "Bezeroa:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Bezeroak</b>"
@@ -6394,38 +6293,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Ikusi _Zerrenda"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Batu kontuak"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6434,12 +6334,12 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6448,54 +6348,54 @@ msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian eta txat taldeetan"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Kontaktua"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "Txat Taldean _Sartu"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Kontaktua Deskonektatuta"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6503,29 +6403,29 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "mezuaren edukia"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6534,125 +6434,126 @@ msgstr ""
 "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
 "aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Konexioak huts egin du"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Azken egoera: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Txat"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Ekintza berri bat jasotzean."
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Baimendu Popup/Jakinarazteak nagoenean:  Kanpoan/Ez Erabilgarri/Lanpetuta/"
 "Ikusezin"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Baimendu Popup/Jakinarazteak nagoenean:  Kanpoan/Ez Erabilgarri/Lanpetuta/"
 "Ikusezin"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6661,63 +6562,63 @@ msgstr ""
 "Gajim-ek gertaera berriez jakinaraziko dizu popup bidez pantailaren beheko "
 "eskubiko aldean"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Ikusizko Jakinarazketa</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Mo_ldatu..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav Soinuak"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 #, fuzzy
 msgid "Notifications"
 msgstr "Kontu Eraldaketa"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Ez Erabilgarri"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6725,7 +6626,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6733,109 +6634,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutu"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Egoerarekin b_at egin"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Eskatu egoera mezua, nagoenean:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Konektatuta"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Deskonektatuta"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Berezko Egoera Mezuak"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Aktibatu"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Egoera Mezua"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Gaia"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Gaia"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Interfazeko kolorea eta letra konfiguratu"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Berezko egoera _ikurra:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Erabili _transporteen ikurrak"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6845,119 +6746,129 @@ msgstr ""
 "ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
 "jarriko dira)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 #, fuzzy
 msgid "Style"
 msgstr "Stalled"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Berezko Egoera Mezuak"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Txat Pribatua"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Konektatu"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Zerbitzaria:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Moldatu..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Denetatik</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Konfigurazio Aurreratuaren Editorea"
@@ -7148,12 +7059,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Sartu pasahitz berria:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Ekintza Aurreratuak"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Erabili bezeroaren hostname/portua"
@@ -7240,7 +7151,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Konektatuta"
@@ -7254,7 +7165,7 @@ msgstr "Mezu berria sortu"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7284,8 +7195,8 @@ msgstr "Be_rezko Koloreak Ezarri"
 msgid "Resets value to default"
 msgstr "Be_rezko Koloreak Ezarri"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Hostname: "
@@ -7329,7 +7240,7 @@ msgstr "Baliogabeko izena"
 msgid "Proxy Host"
 msgstr "Proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Mota"
 
@@ -7343,8 +7254,7 @@ msgstr "_Protokoloa:"
 msgid "Copy info to clipboard"
 msgstr "_Lotura kokapena kopiatu"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 #, fuzzy
 msgid "Features"
 msgstr "Zerbitzariaren Ezaugarriak:"
@@ -7529,6 +7439,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Egoera Mezua aldatu"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -7607,8 +7522,8 @@ msgstr "Stalled"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7800,80 +7715,106 @@ msgstr "Konexioak huts egin du"
 msgid "_Name"
 msgstr "_Izena "
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Elkarrizketa Hasi"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Txat Taldea Berria"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Historial Administratzailea"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Konexioak huts egin du"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Hobespenak"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "At_era"
+msgid "_Accounts"
+msgstr "Kontuak"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Ikusi"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Trans_porteak Erakutsi"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr " XML Konsola"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Fitxero Transferentzia"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Laguntza"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "bederatzi"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "bederatzi"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Zerbitzariaren Ezaugarriak:"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "About"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7888,6 +7829,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Txat Taldea Berria"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8169,60 +8115,68 @@ msgstr "Kontaktua Deskonektatuta"
 msgid "Create new group chat"
 msgstr "Txat Taldea Berria"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "egoera mezua"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "_XML Konsola Ikusarazi"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Arau bat editatu</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontaktua"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Kontaktua"
@@ -8298,12 +8252,16 @@ msgstr "Formularioan bete"
 msgid "Group Chat Configuration"
 msgstr "Txat Taldeko Gonbidapena"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr " XML Konsola"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "Elkarrizketa  _Hasi"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filtroa:"
@@ -8350,11 +8308,6 @@ msgstr "Ikusi Gabeko _Gertaerak"
 msgid "Mute Sounds"
 msgstr "Soinua Kendu"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Hobespenak"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8678,124 +8631,124 @@ msgstr ""
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Inor ez"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s gelan sartu da"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Txat Taldeak"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Inor ez"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Txat Taldeak"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Inor ez"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Gela honek ez du gairik"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Txat Taldeak"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Txat Taldeak"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Txat Taldeak"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Inor ez"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
@@ -8824,7 +8777,7 @@ msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
@@ -8977,7 +8930,7 @@ msgstr "Fitxeroa:"
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
@@ -8992,7 +8945,7 @@ msgid "Change"
 msgstr "Aldatu _Izengoitia"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Laster etorriko naiz"
@@ -9023,11 +8976,12 @@ msgid "Password Change Failed"
 msgstr "Pasahitza behar da"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Aldatu Pasahitza"
 
@@ -9062,40 +9016,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Konektatu"
+msgid "Start / Join Chat"
+msgstr "Elkarrizketa Hasi"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Kontaktua Gehitu..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s ez da aurkitu"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9104,33 +9053,33 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Besteak"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Txat _Taldea"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9138,145 +9087,145 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Bilatu"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Azalpenak: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Eskaneatzen  %d / %d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 #, fuzzy
 msgid "Node"
 msgstr "Ezer ez"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Mezu berria"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Bidali Mezu Bakarra"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "gaia"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
@@ -9323,91 +9272,75 @@ msgstr "vCard argitarapena egina"
 msgid "Registration failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
-"hizkuntz bat aukeratu speller_language aukera erabiliz."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "%s konturako"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG zenbakia:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Txat Taldeko Gonbidapena"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
@@ -9422,6 +9355,11 @@ msgstr "GG zenbakia:"
 msgid "ICQ Number"
 msgstr "ICQ zanbakia:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Kontaktua Gehitu..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9477,7 +9415,7 @@ msgstr "Errorea zerbitzarian sartzean.%s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9638,31 +9576,51 @@ msgstr "Kontaktua Deskonektatuta"
 msgid "Contact Connected Background "
 msgstr "Kontaktua Konektatuta"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Egoera Mezua"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Egoera Mezua"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Egoera Mezua"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Egoera Mezua"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9671,12 +9629,12 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktibatuta"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Konexioak huts egin du"
@@ -9700,10 +9658,9 @@ msgid "Error: %s"
 msgstr "Errore mezua: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr ""
 
@@ -9717,48 +9674,48 @@ msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Arratsaldea"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Proxy Profila Moldatu"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "Egoerarekin b_at egin"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Deskonektatuta"
@@ -9779,7 +9736,7 @@ msgstr "Kontua"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Zure kontu berria egoki sortua izan da."
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9811,61 +9768,66 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Zer nahi duzu egitea?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Konektatzen"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "%d mezu irakurri gabe"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber bezeroa"
@@ -9923,130 +9885,130 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Aukeratu Irudia"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Fitxategi guztiak"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Fitxategi guztiak"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Bidali _Fitxeroa"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Irudiak"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Aukeratu Irudia"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Fitxategi guztiak"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Gorde Bezala..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "Gela honetako %(owner_or_admin_or_member)s "
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 #, fuzzy
 msgid "Connected"
 msgstr "Konektatu"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Fitxeroaren izena: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Deskargatu"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Kargatu"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Gelditua"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Gelditua"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 #, fuzzy
 msgid "Description: "
 msgstr "Deskribapena: %s"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Gelditua"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Gelditua"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Gelditua"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Gelditua"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Gelditua"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Gelditua"
@@ -10055,7 +10017,7 @@ msgstr "Gelditua"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Fitxero Baliogabea"
@@ -10113,26 +10075,26 @@ msgstr "Txat Taldeko Mezu Nabarmendua"
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Pasahitza behar da"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Ezer ez"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_kantzelatu"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10151,11 +10113,6 @@ msgstr "%s kontua erabiliz "
 msgid "Hide _Contact List"
 msgstr "Kontaktua"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Ikusi _Deskonektatutako Kontaktuak"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
@@ -10205,36 +10162,31 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Hobespenak"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Hobespenak"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Ez zaude zerbitzarira konektatuta"
+msgid "Archiving Preferences Error"
+msgstr "_Hobespenak"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Sarrera berri bat jaso duzu:"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Hobespenak"
-
 #: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
@@ -10285,172 +10237,172 @@ msgstr "Inork ez"
 msgid "?password:Hidden"
 msgstr "Pasahitza:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Hobespenak"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Automatikoki ez erabilgarriko egoera mezua"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Konektatu"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "_Ahotsa"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Automatikoki ez erabilgarriko egoera mezua"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Kontu Eraldaketa"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Pasahitza behar da"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Gorde pasahitza"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Historial Administratzailea"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Hobespenak"
@@ -10496,7 +10448,7 @@ msgstr "Baliogabeko izen zerrenda"
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Kontaktua"
@@ -10524,7 +10476,7 @@ msgstr "_Bukatu"
 msgid "Commands"
 msgstr "Azalpenak: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10596,120 +10548,134 @@ msgstr "Harpidetza baimena %s kontutik"
 msgid "Loading"
 msgstr "Sortzen"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Konektatu"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Log aktibatua"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "%s kontua ezabatzen"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Sakatu kontuaren pasahitza aldatzeko"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Konektatzen"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Mezu berria sortu"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Ekintza Aurreratuak"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Debekatzen %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "%s kontua ezabatzen"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "%s -ra erregistratua"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Kontua"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Kontuak"
@@ -10752,248 +10718,252 @@ msgstr "Bilatu"
 msgid "No results found"
 msgstr "%s ez da aurkitu"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Berezkoa"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Birkargatu orain?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Birkargatu orain?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Kontu izen baliogabea"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Kontu izen baliogabea"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kontaktua"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Baliogabeko izena"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "K_onektatu Gajim irikitzean"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "_Gorde kontu guztien elkarrizketak"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Egoera Guztiak"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Erabili proxy fitxero transferentzia"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " %s-etik"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kontaktua"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Lehentas_una:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Konexioa ez erablgarri"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Lehen Izena:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Azken Izena:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "E-Posta Berria"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Egoerarekin b_at egin"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Aktibatu"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Portua:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Konektatu"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Baliogabeko izena"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Gorde pasahitza"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Konexioak huts egin du"
@@ -11046,19 +11016,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Zerrendatik kontaktua ezabatu"
 msgstr[1] "Zerrendatik kontaktua ezabatu"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11070,21 +11040,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Talde Agendan Sartu Gela hau"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Fitxeroaren tokia"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11141,127 +11111,236 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontaktua"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Txat Taldeak"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Berriki:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Konexioak huts egin du"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Konektatu"
+
+#, fuzzy
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "D-Bus bertsioa aurkitugabea: %s"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
+#~ "hizkuntz bat aukeratu speller_language aukera erabiliz."
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "Kontaktua Deskonektatuta"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "At_era"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Ikusi _Deskonektatutako Kontaktuak"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Kontaktua Gehitu..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Kontaktua"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Txat Taldea Berria"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Txat Taldea Berria"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri "
+#~ "gabeko mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Baliogabeko karakterea hostname -ean."
+
+#~ msgid "Server address required."
+#~ msgstr "Zerbitzariaren helbidea behar da."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Baliogabeko karakterea izenean."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Invalid character in resource."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Jakinarazi kontaktuek hau egitean: "
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Jakinarazi kontaktuek hau egitean: "
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "_Ikusarazi gertaera zerrendan"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Jakinarazi  fitxeroa transferitu denean"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Jakinarazi  fitxeroa transferitu denean"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Gertaera"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Gertaerak"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Ez zaude zerbitzarira konektatuta"
+
+#, fuzzy
 #~ msgid "Resource Conflict"
 #~ msgstr "Erabiltze izenarekin gatazka"
 
@@ -11809,9 +11888,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Bidali Mezu Pribatu bat"
 
-#~ msgid "Send _File"
-#~ msgstr "Bidali _Fitxeroa"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Partaideak"
@@ -13708,10 +13784,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Stalled"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Konexioak huts egin du"
-
 #~ msgid "cyan"
 #~ msgstr "cyan"
 
@@ -13853,10 +13925,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Network-Watcher"
 #~ msgstr "Historial Administratzailea"
 
-#, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Historial Administratzailea"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -14139,9 +14207,6 @@ msgstr "Konexioak huts egin du"
 #~ "your setup you can select another one here.\n"
 #~ "You might consider to change possible firewall settings."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Batu kontuak"
-
 #, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP ezin da ordenagailu honetan erabili"
diff --git a/po/fr.po b/po/fr.po
index fcefa8a12..5c5f9636e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,72 +14,78 @@ msgstr ""
 "X-Pootle-Path: /fr/gajim/fr.po\n"
 "X-Pootle-Revision: 1011\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, python-format
+msgid "Account: %s"
+msgstr "Compte : %s"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "et authentifiée"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "et NON authentifiée"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "Chiffrement %(type)s actif %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "A_nnuler"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "Coller en tant que citation"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "Coller l'image"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr "Vous essayez de coller une image"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 "Êtes-vous sûr de vouloir coller l'image du presse-papier dans la "
 "conversation ?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "Co_ller"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Avertissement"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 "Si vous envoyer un fichier à <b>%s</b>, votre vrai adresse XMPP sera révélé."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Continuer"
 
@@ -141,429 +147,440 @@ msgstr "Il n’y a aucune requête d’inscription en attente."
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 msgid "Not in contact list"
 msgstr "Absent de la liste de contacts"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 msgid "I would like to add you to my contact list"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Envoyer un _message simple …"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "_Exécuter une commande …"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "Re_nommer …"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Débloquer"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Suppri_mer"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Information"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Envoyer un fichier …"
+#: gajim/gui_menu_builder.py:517
+#, fuzzy
+msgid "Send File"
+msgstr "Envoyer un _fichier"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
 msgstr "Envoyer un fichier …"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr "Enregistrer un fichier directement …"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 msgid "Send Chatstate"
 msgstr "Envoyer l’état de discussion"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+#, fuzzy
+msgid "Invite Contacts…"
 msgstr "Inviter des contacts"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
-msgid "Add to Contact List"
-msgstr "Ajouter à la liste de contacts"
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
+msgid "Add to Contact List…"
+msgstr "Ajouter à la liste de contacts …"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 msgid "Voice Chat"
 msgstr "Discussion vocale"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 msgid "Video Chat"
 msgstr "Visioconférence"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "Information"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "Historique"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Seulement en train d’écrire"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Tous les états"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Inviter des contacts"
+msgid "All Chat States"
+msgstr "Tous les états"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 msgid "Manage Group Chat"
 msgstr "Gérer le salon"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
-msgid "Rename Group Chat"
-msgstr "Renommer le salon"
+#: gajim/gui_menu_builder.py:575
+#, fuzzy
+msgid "Rename…"
+msgstr "Re_nommer …"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
+#: gajim/gui_menu_builder.py:576
+#, fuzzy
+msgid "Change Subject…"
 msgstr "Changer le sujet"
 
-#: gajim/gui_menu_builder.py:579
-msgid "Configure Group Chat"
-msgstr "Configure le Groupe de Discussion"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "Envoyer un avatar…"
 
-#: gajim/gui_menu_builder.py:581
-msgid "Destroy Group Chat"
-msgstr "Détruire le salon de discussion"
+#: gajim/gui_menu_builder.py:578
+#, fuzzy
+msgid "Configure…"
+msgstr "Configurer"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "_Détruire"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 msgid "Chat Settings"
 msgstr "Paramètres de la fenêtre de discussion"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+#, fuzzy
+msgid "Show Join/Leave"
 msgstr "Montrer connecté/parti"
 
-#: gajim/gui_menu_builder.py:585
-msgid "Show status changes"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Show Status Changes"
 msgstr "Afficher les changements d’état"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
+#: gajim/gui_menu_builder.py:584
+#, fuzzy
+msgid "Notify on all Messages"
 msgstr "Avertir pour tous les messages"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Minimize on Close"
 msgstr "Minimiser à la fermeture"
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Minimize When Joining Automatically"
 msgstr "Minimiser à la connexion automatique"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "Seuil de synchronisation"
 
-#: gajim/gui_menu_builder.py:593
-msgid "Change Nickname"
+#: gajim/gui_menu_builder.py:591
+#, fuzzy
+msgid "Change Nickname…"
 msgstr "Changer de pseudonyme"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "Demander la parole"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "Exécuter une commande"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+#, fuzzy
+msgid "Execute Command…"
+msgstr "_Exécuter une commande …"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr "Quitter"
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "Pas de seuil"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i jour"
 msgstr[1] "%i jours"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Seulement en train d’écrire"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Tous les états"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
 msgstr "Ajouter un contact…"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "Envoyer un _message simple…"
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
 msgstr "Découvrir les services"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "Informations du serveur"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avancées"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "Éditer les préférences d’archivage"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 msgid "Blocking List"
 msgstr "Liste des bannis"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Marques-pages"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 msgid "PEP Configuration"
 msgstr "Configuration PEP"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "Synchronise History…"
 msgstr "Synchroniser l’historique"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 msgid "Send Server Message…"
 msgstr "Envoyer un message au serveur…"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 msgid "Set MOTD…"
 msgstr "Définir MOTD…"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr "Mettre à jour MOTD…"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 msgid "Delete MOTD…"
 msgstr "Supprimer MOTD…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 msgid "_Add Account…"
 msgstr "_Ajouter un compte…"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 msgid "_Modify Accounts…"
 msgstr "_Modifier des comptes …"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 msgid "_Modify Account…"
 msgstr "_Modifier le compte …"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Comptes"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 msgid "Copy XMPP Address"
 msgstr "Copier l’adresse XMPP"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
 msgstr "Rejoindre un salon de discussion"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-msgid "Add to Contact List…"
-msgstr "Ajouter à la liste de contacts …"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
 msgstr "Copier l'adresse du lien"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 msgid "Open Link in Browser"
 msgstr "Ouvrir le lien dans le navigateur"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
 msgstr "Copier l’adresse électronique"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 msgid "Open Email Composer"
 msgstr "Ouvrir le logiciel de courriel"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 msgid "Copy Location"
 msgstr "Copier l'emplacement"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 msgid "Show Location"
 msgstr "Montrer l'emplacement"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 msgid "Copy XMPP Address/Email"
 msgstr "Copier l’adresse XMPP/électronique"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 msgid "Invite"
 msgstr "Inviter"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr "Bloquer"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 msgid "Kick"
 msgstr "Éjecter"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 msgid "Ban"
 msgstr "Bannir"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 msgid "Make Owner"
 msgstr "Rendre propriétaire"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 msgid "Make Admin"
 msgstr "Rendre admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 msgid "Make Member"
 msgstr "Rendre membre"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 msgid "Revoke Member"
 msgstr "Révoquer membre"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr "Accorder la parole"
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 msgid "Revoke Voice"
 msgstr "Révoquer la parole"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 msgid "Copy"
 msgstr "Copier"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Options :"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Afficher ce message d'aide et quitter"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Indiquer un répertoire pour le fichier de log"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Impossible de trouver la base de données de l’historique"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "%s n'existe pas"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 msgid "XMPP Address"
 msgstr "Adresse XMPP"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Date"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -571,27 +588,27 @@ msgstr "Date"
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Message"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Sujet"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Nettoyage de la base de données"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 msgid "Clean up the database?"
 msgstr "Nettoyer la base de données ?"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
@@ -602,33 +619,33 @@ msgstr ""
 "sera simplement ré-utilisable. Cette action pourrait prendre un certain "
 "temps."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 msgid "_Cleanup"
 msgstr "_Nettoyer"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Vous"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s le %(time)s a dit : %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Supprimer"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Supprimer la conversation"
 msgstr[1] "Supprimer les conversations"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -637,151 +654,151 @@ msgstr[0] ""
 "b> ?"
 msgstr[1] "Désirez-vous supprimer de façon permanente ces conversations ?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Supprimer le message"
 msgstr[1] "Supprimer les messages"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Voulez-vous supprimer ce message de façon permanente ?"
 msgstr[1] "Voulez-vous supprimer ces messages de façon permanente ?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nom du contact : <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr "Adresse XMPP : <i>%s</i>"
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Général"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Groupe"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Définir l’Humeur"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Aucun"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d’état %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Message d’état"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr "Remplacer"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Remplacer le message de statut ?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Ce nom pré-enregistré est déjà utilisé. Voulez vous remplacer cet "
 "enregistrement ?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr "É_craser"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Message d’état"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Enregistrer comme messages d'état prédéfini..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Tapez un nom pour ce message d’état"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 msgid "New Status"
 msgstr "Nouvel état"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Vous n’êtes pas connecté au serveur"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nom"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Serveur"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Vous ne pouvez pas vous synchroniser avec un compte sauf s’il est connecté."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "audio et vidéo"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "audio"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "vidéo"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -790,85 +807,89 @@ msgstr ""
 "%(contact)s veut démarrer un discussion %(type)s avec vous. Voulez-vous "
 "répondre à son appel ?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Envoyer un fichier …"
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Envoyer le fichier (max. %s MiB)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 msgid "No File Transfer available"
 msgstr "Pas de transfert de fichier disponible"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 msgid "Invalid XMPP Address"
 msgstr "Adresse XMPP invalide"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Impossible de charger l’image"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, python-format
 msgid "Kick %s"
 msgstr "Expulse %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr "Bannit %s"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 msgid "Voice Request"
 msgstr "Requête de voix"
 
-#: gajim/groupchat_control.py:830
-#, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+#: gajim/groupchat_control.py:831
+#, fuzzy, python-format
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr "<b>%s</b> de <b>%s</b> demande à parler"
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr "_Approuver"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s a changé le sujet en %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 msgid "Group chat now does not show unavailable members"
 msgstr "Le salon n’affiche plus les membres non-disponibles"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr "Un paramètre non lié à la vie privée a été changé"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 msgid "Conversations are stored on the server"
 msgstr "Les conversations sont archivées sur le serveur"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 msgid "Conversations are not stored on the server"
 msgstr "Les conversations ne sont pas archivées sur le serveur"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 msgid "Group chat is now non-anonymous"
 msgstr "Le salon n’est plus anonyme"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 msgid "Group chat is now semi-anonymous"
 msgstr "Le salon est maintenant semi-anonyme"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 msgid "Group chat is now fully anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
@@ -882,7 +903,7 @@ msgstr "Ping ? (%s)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong ! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Erreur."
 
@@ -909,22 +930,22 @@ msgstr "Un nouveau salon a été créé"
 msgid "Failed to Configure Group Chat"
 msgstr "Configure le Groupe de Discussion"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} est maintenant connu en tant que {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Vous êtes désormais {show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} est maintenant {show}{status}"
@@ -1046,52 +1067,52 @@ msgstr "Êtes-vous sûr de vouloir quitter le salon ?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Si vous fermez cette fenêtre, vous quitterez '%s'."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr "_Partir"
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s a été invité dans ce salon"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Afficher une liste de styles"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Ce contact ne prend pas en charge le HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping ?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong ! (%s secondes)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "État %(type)s : %(state)s, raison : %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s du salon de discussion %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Activer le chiffrage ESessions pour ce compte."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
-msgstr ""
+msgstr "Note : l'historique de discussion est désactivé pour ce compte."
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, python-format
 msgid ""
 "You just received a new message from %s.\n"
@@ -1100,26 +1121,26 @@ msgstr ""
 "Vous venez de recevoir un nouveau message de %s.\n"
 "Voulez-vous fermer cet onglet ?"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 msgid "Close"
 msgstr "Fermer"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr "_Fermer"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1128,173 +1149,164 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s est maintenant %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "Transfert de fichiers"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Taille"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 msgid "Open _Folder"
 msgstr "Ouvrir le _dossier"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 msgid "Group Chat Invitation"
 msgstr "Invitation à un salon"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Le contact distant à stoppé le transfert"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Erreur à l’ouverture du fichier"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr "Afficher la version de l’application"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "Ne montrer que les erreurs critiques"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 "Séparer les fichiers de profil complètement (même la base de données de "
 "l’historique et les plugins)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr "Affiche le flux XML et autres informations de débogage"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Utilise un profil défini dans le dossier de configuration"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Fixe le répertoire de configuration"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Configurer le système de log"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "Afficher tous les avertissements"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "Ouvrir un shell IPython"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Commencer une nouvelle discussion"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "Simule une perte de connexion"
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "Simule le rétablissement de la connexion"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Passerelles"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 msgid "Group chats"
 msgstr "Groupes de discussion"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr "L’autorisation a été envoyée"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "La requête d’inscription a été envoyée"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Si \"%s\" accepte cette requête vous connaîtrez son état."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
 msgstr "L’autorisation a été supprimée"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
@@ -1303,7 +1315,7 @@ msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
 msgid "desynced"
 msgstr "désynchronisé"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr "Quitter Gajim"
 
@@ -1320,7 +1332,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "_Toujours quitter en fermant Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Quitter"
 
@@ -1464,8 +1477,8 @@ msgstr "Renommer le groupe %s ?"
 msgid "Please enter a new name"
 msgstr "Veuillez saisir un nouveau nom"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 msgid "_Rename"
 msgstr "_Renommer"
 
@@ -1483,26 +1496,30 @@ msgid "_Also remove all contacts of this group from contact list"
 msgstr ""
 "Supprimer également de la liste tous les contacts appartenant à ce groupe"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+msgid "Rename Group Chat"
+msgstr "Renommer le salon"
+
+#: gajim/roster_window.py:3045
 msgid "Please enter a new name for this group chat"
 msgstr "Veuillez saisir un nouveau nom pour ce salon"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 msgid "Remove Contact"
 msgstr "Supprimer un contact"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 msgid "Remove contact from contact list"
 msgstr "Enlever le contact de la liste de contacts"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr ""
 "Vous êtes sur le point de supprimer « %(name)s » (%(jid)s) de votre liste de "
 "contacts.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
@@ -1510,19 +1527,19 @@ msgstr ""
 "En supprimant ce contact vous enlevez aussi leurs autorisations. Ce contact "
 "vous verra donc toujours déconnecté⋅e."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr "_Autoriser ce contact à connaître mon état après suppression"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 msgid "Remove contacts from contact list"
 msgstr "Enlever les contacts de la liste de contacts"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1535,24 +1552,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 msgid "Remove Contacts"
 msgstr "Supprimer les contacts"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Le stockage des métacontacts n'est pas supporté par votre serveur"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1561,11 +1578,11 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
 msgstr "Vous êtes sur le point de créer un méta-contact"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
@@ -1575,119 +1592,121 @@ msgstr ""
 "Généralement, cela est utile lorsqu'une même personne possède plusieurs "
 "comptes XMPP ou de transport."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 msgid "Create Metacontact"
 msgstr "Créer un méta-contact"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr "_Créer"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Envoyer ce fichier à %s :\n"
 msgstr[1] "Envoyer ces fichiers à %s :\n"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "En_voyer"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Envoyer %(from)s à %(to)s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "Faire de %s le premier contact"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Faire de %(contact1)s et %(contact2)s des métacontacts"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Publier l'emplacement"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter à"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Gérer les contacts"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "Éditer les _groupes…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 msgid "Re_name"
 msgstr "Re_nommer"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Reconnecter"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "Exécuter une commande"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historique"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observateurs"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
+"Les observateurs peuvent voir votre état, mais vous n'êtes pas autorisé à "
+"voir les leurs"
 
 #: gajim/conversation_textview.py:63
 msgid "Untrusted"
@@ -1807,66 +1826,66 @@ msgstr "Conversations privées"
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorisation HTTP (%(method)s) pour %(url)s (ID : %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Acceptez vous cette requête (compte : %s) ?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 msgid "Authorization Request"
 msgstr "Demande d'autorisation"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 msgid "HTTP Authorization Request"
 msgstr "Demande d'autorisation HTTP"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 msgid "_No"
 msgstr "_Non"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Requête d'Inscription"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Le contact \"%s\" vous a autorisé à voir son état."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 msgid "Subscription Removed"
 msgstr "Inscription supprimée"
 
-#: gajim/gui_interface.py:354
-#, python-format
-msgid "%s (%s) has removed subscription from you"
+#: gajim/gui_interface.py:328
+#, fuzzy, python-format
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "%s (%s) ne vous permet plus de voir sa présence"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
@@ -1874,143 +1893,143 @@ msgstr ""
 "Vous verrez toujours ce contact hors-ligne.\n"
 "Voulez vous le supprimer de votre liste de contacts ?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Désinscrit⋅e"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s a refusé l'invitation : %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s a refusé l'invitation"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Vous êtes invité⋅e dans le groupe de discussion {room} par {user}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "Mot de passe du certificat requis"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Entrez le mot de passe du certificat pour le compte %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 msgid "Remote Contact Stopped Transfer"
 msgstr "Le contact à arrêté le transfert"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 msgid "Error Opening File"
 msgstr "Erreur lors de l'ouverture du fichier"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 msgid "SSL Certificate Error"
 msgstr "Erreur de certificat SSL"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Échec du transfert de fichier"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s reçu de %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Le transfert du fichier %(filename)s de la part de %(name)s a échoué."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Le transfert du fichier %(filename)s à %(name)s a échoué."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 msgid "Please enter a new username for your local account"
 msgstr "Veuillez entrer un nouveau nom d'utilisateur pour votre compte local"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Requête d'appel"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 msgid "Insecure Connection"
 msgstr "Connexion non-sécurisée"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2021,19 +2040,19 @@ msgstr ""
 "de façon non-sécurisé. Cela signifie que vos conversations ne seront pas "
 "chiffrées. La connexion non chiffrée est vraiment déconseillée."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr "_Abandonner"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 msgid "_Connect Anyway"
 msgstr "Se _connexion quand même"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos paramètres et préférences"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr "Gajim : Console IPython"
 
@@ -2225,11 +2244,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Échec lors de l’envoi de l’avatar"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "L’envoi du message privé a échoué"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2552,80 +2571,74 @@ msgstr ""
 "L'argument \"%(arg)s\" n'est pas précisé.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s est un répertoire mais devrait être un fichier"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, python-format
 msgid "Creating %s"
 msgstr "Création de %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Erreur SSL inconnue : %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Nouveau message de %(nickname)s"
 msgstr[1] "%(n_msgs)i messages non lus de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 msgid "New Group Chat Message"
 msgstr "Créer un salon de discussion"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a changé d'état"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté⋅e"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté⋅e"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
-#, fuzzy
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 msgid "Authentication failed"
-msgstr "Echec de l'authentification avec \"%s\""
+msgstr "Échec de l'authentification"
 
 #: gajim/common/config.py:76
 msgid ""
@@ -2692,59 +2705,22 @@ msgstr ""
 "n'est pas affichée."
 
 #: gajim/common/config.py:93
-msgid "Notification color for contacts signing in."
-msgstr "Couleur des notifications lorsqu'un contact se connecte."
-
-#: gajim/common/config.py:94
-msgid "Notification color for contacts signing out."
-msgstr "Couleur des notifications lorsqu'un contact se déconnecte."
-
-#: gajim/common/config.py:95
-msgid "Notification color for new message notification."
-msgstr "Couleur des notifications de nouveau message."
-
-#: gajim/common/config.py:96
-msgid "Notification color for file transfer request."
-msgstr "Couleur des notifications de requête de transfert de fichier."
-
-#: gajim/common/config.py:97
-msgid "Notification color for file transfer errors."
-msgstr "Couleur des notifications d'erreur de transfert de fichier."
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-"Couleur des notifications lorsqu'un transfert de fichier s'arrête ou finit."
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr "Couleur des notifications d'invitation pour les salons de discussion"
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr "Couleur des notifications lors d'un changement d'état."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr "Couleur des notifications pour les autres événements."
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Liste (séparée par des espaces) de lignes (comptes et groupes) qui sont "
 "repliés."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "Par défaut"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr "Langue utilisée par le vérificateur orthographique"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2755,16 +2731,16 @@ msgstr ""
 "minute.\n"
 "'never' - ne jamais afficher l'heure."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr "Si activé, les émojis ASCII seront transformés en émojis graphiques."
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 "Traiter les paires de * / _ comme des éventuels caractères de formatage."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
@@ -2772,7 +2748,7 @@ msgstr ""
 "Si activé, ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
 "les * *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
@@ -2780,7 +2756,7 @@ msgstr ""
 "Caractère à ajouter après le surnom en utilisant la complétion automatique "
 "(tab) dans un salon de discussion."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
@@ -2788,7 +2764,7 @@ msgstr ""
 "Caractère ajouté automatiquement après un surnom si celui-ci est déjà "
 "utilisé dans le salon de discussion."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
@@ -2796,11 +2772,11 @@ msgstr ""
 "Si activé, Gajim sauvera la position de la liste de contacts avant de la "
 "cacher, et la restaurera en la faisant réapparaître."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr "Placer la liste de contact sur la droite dans le monde fenêtre unique"
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2813,20 +2789,20 @@ msgstr ""
 "Consultez la documentation python à propos de strftime pour une "
 "documentation complète : (https://docs.python.org/3/library/time.html)."
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Caractères affichés avant le surnom dans les conversations."
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Caractères affichés après le surnom dans les conversations."
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Si activé, Gajim ajoutera * et [n] dans le titre de la fenêtre de contacts"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
@@ -2834,14 +2810,14 @@ msgstr ""
 "Nombre de messages de l'historique à afficher lorsque l'onglet ou la fenêtre "
 "de discussion est ouvert à nouveau."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 "De combien doit-on remonter dans le temps (en minutes) lors de la "
 "restauration de l'historique. -1 signifie pas de limite."
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
@@ -2850,17 +2826,17 @@ msgstr ""
 "automatiquement à un salon dont vous avez été déconnecté. Mettre à 0 pour "
 "désactiver la reconnexion automatique."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
 "Nombre de lignes à stocker pour Ctrl+flèche du haut (messages précédemment "
 "envoyés)."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -2869,13 +2845,13 @@ msgstr ""
 "Soit une URL personnalisée contenant %%s (où %%s est le mot/la phrase), soit "
 "\"WIKITIONARY\" (ce qui signifie l'utilisation de Wikitionary)."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-"
 "remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
@@ -2883,16 +2859,16 @@ msgstr ""
 "Au lieu d'afficher l'heure à chaque message ('print_time'==sometimes), "
 "l'afficher toutes les x minutes."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr "Demander avant de coller une image."
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Demander avant de fermer un onglet ou une fenêtre de discussion de salon."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
@@ -2901,7 +2877,7 @@ msgstr ""
 "peuvent être perdues (conversations, conversations privées, salons qui se "
 "seront pas minimisés)."
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
@@ -2910,31 +2886,31 @@ msgstr ""
 "interfaces locales, pour les transferts de fichiers (dans le cas de "
 "traduction d'adresse / redirection de port)."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "D'après le standard IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "M'alerter à l'aide de l'icône dans la zone de notifications."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Afficher la bordure fenêtres de discussion à onglets ?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Aperçu des nouveaux messages dans un popup ?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
@@ -2942,7 +2918,7 @@ msgstr ""
 "Une liste de mots (séparés par des points-virgules) qui seront mis en "
 "surbrillance dans les salons."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
 "This setting is taken into account only if the notification area icon is "
@@ -2952,7 +2928,7 @@ msgstr ""
 "fenêtre. Cette option n'est prise en compte que si la barre de notification "
 "est utilisée."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
@@ -2960,15 +2936,7 @@ msgstr ""
 "Si activé, Gajim cache la fenêtre de la liste des contacts lorsqu'on appuie "
 "sur le bouton X au lieu de la minimiser dans la barre de notification."
 
-#: gajim/common/config.py:204
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Si activé, Gajim affichera une icône dans chaque onglet contenant des "
-"messages non lus. En fonction du thème, cette icône peut être animée."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -2977,7 +2945,7 @@ msgstr ""
 "Si activé, Gajim affichera le message d'état, s'il n'est pas vide, sous le "
 "nom de chaque contact dans la liste des contacts."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
@@ -2985,7 +2953,7 @@ msgstr ""
 "Définir la position de l'avatar dans la liste des contacts. Peut être à "
 "droite (right) ou à gauche (left)."
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -2994,7 +2962,7 @@ msgstr ""
 "Si désactivé, vous ne verrez plus les lignes d'état dans les conversations "
 "quand un contact modifie son état et/ou son message d'état."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
@@ -3003,7 +2971,7 @@ msgstr ""
 "Paramètres par défaut : Montrer le message d’état pour chaque connexion ou "
 "déconnexion au groupe de discussion"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
@@ -3012,12 +2980,12 @@ msgstr ""
 "Paramètres par défaut : montrer un message d'état pour chaque changement "
 "d’état des utilisateurs dans un salon de discussion"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Ne pas afficher d'icône dans la barre des tâches."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3027,7 +2995,7 @@ msgstr ""
 "gestionnaires de fenêtres) la fenêtre quand elle contient des événements non "
 "lus."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3048,7 +3016,7 @@ msgstr ""
 "'pertype' - Toutes les conversations d'un même type (discussion, salon) dans "
 "la même fenêtre."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3061,36 +3029,36 @@ msgstr ""
 "'never' - Jamais montrer.\n"
 "'last_state' - Restaurer le dernier état."
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Si activé, Gajim affichera les avatars dans les fenêtres de conversation."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Si activé, appuyer sur la touche d'échappement fermera l'onglet ou la "
 "fenêtre de conversation."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr ""
 "Cache la liste des occupants du salon dans les fenêtres des salons de "
 "discussion."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3099,11 +3067,11 @@ msgstr ""
 "Dans une conversation, affiche le surnom au début d'une ligne seulement "
 "lorsque ce n'est pas la même personne qui a écrit le dernier message."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation lors du fusionnement d'un surnom répété."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3112,7 +3080,7 @@ msgstr ""
 "Ctrl-Tab pour basculer au prochain onglet lorsqu'aucun d'entre eux n'a de "
 "nouveaux messages non lus."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3121,7 +3089,7 @@ msgstr ""
 "Afficher ou non la fenêtre de dialogue de confirmation de blocage d'un "
 "contact ? Une valeur vide signifie ne jamais l'afficher."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3130,7 +3098,7 @@ msgstr ""
 "Afficher ou non la fenêtre de dialogue de confirmation de blocage d'un "
 "contact ? Une valeur vide signifie ne jamais l'afficher."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3142,7 +3110,7 @@ msgstr ""
 "connecté avec une priorité négative, vous ne recevrez AUCUN message en "
 "provenance de votre serveur."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3151,7 +3119,7 @@ msgstr ""
 "Si activé, Gajim montrera le nombre de contacts connectés et totaux sur les "
 "lignes de groupe et de compte."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3160,13 +3128,13 @@ msgstr ""
 "Si activé, Gajim défilera et sélectionnera le contact qui vous a envoyé le "
 "dernier message, si la fenêtre de conversation n'est pas déjà ouverte."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Temps d'inactivité nécessaire pour que la fenêtre de changement de statut se "
 "faire."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3174,12 +3142,7 @@ msgstr ""
 "Nombre maximum de lignes affichées dans les conversations. Les lignes les "
 "plus vieilles sont effacées."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-"Choisissez l'intervalle en secondes entre deux vérifications de l'inactivité."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3188,31 +3151,31 @@ msgstr ""
 "Schémas d'uri valides. Seuls les schémas dans cette liste seront acceptés "
 "comment « vraies » uri. (mailto et xmpp sont gérés séparément)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Si activé, la complétion dans les salons sera similaire à celle d'un shell"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Fixe éventuellement le nombre d'image par seconde pour la sortie video "
 "jingle. Exemple : 10/1 ou 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Redimenssionne éventuellement la sortie video jingle. Exemple : 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
-msgstr ""
+msgstr "Si activé, vous verrez aussi le flux vidéo de votre webcam."
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3222,11 +3185,11 @@ msgstr ""
 "de jingle. Celui défini dans l'option \"stun_server\", ou celui donné par le "
 "serveur XMPP."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr "Serveur STUN a utiliser avec jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3235,7 +3198,7 @@ msgstr ""
 "Si activé, Gajim affichera l'affiliation des occupant.e.s des salons de "
 "discussions en ajoutant un carré coloré à l'icône d'état"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
@@ -3244,12 +3207,12 @@ msgstr ""
 "Serveur mandataire utilisé pour toutes les connexions sortantes si le compte "
 "n'a pas de serveur mandataire spécifique configuré"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 #, fuzzy
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr "Si activé, Gajim ignorera les demandes d'attention (\"wizz\")."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3257,7 +3220,7 @@ msgstr ""
 "Si activé, Gajim rouvrira les fenêtres de discussion ouvertes lors de la "
 "dernière fermeture de Gajim."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3266,14 +3229,7 @@ msgstr ""
 "Si activé, Gajim affichera un icône montrant que les messages envoyés ont "
 "été reçus par votre contact"
 
-#: gajim/common/config.py:256
-#, fuzzy
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-"Montre un avatar miniature dans l'onglet de la fenêtre de discussion et dans "
-"l'icône de la fenêtre"
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3281,20 +3237,20 @@ msgstr ""
 "Si activé, Gajim utilisera le trousseau de clé du système pour stocker les "
 "mots de passe des comptes."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 #, fuzzy
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Si activé, Gajim exécutera les commandes de la XEP-0146."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2 : Système, 1 : Activé, 0 : Désactivé"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr "Options possibles, en jours, dans le menu du seuil de synchronisation"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 #, fuzzy
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
@@ -3303,7 +3259,7 @@ msgstr ""
 "Nombre maximum de jours d'historique demandé au serveur lorsqu’un salon "
 "publique est rejoint. 0 : Autant que possible"
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 #, fuzzy
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
@@ -3312,13 +3268,15 @@ msgstr ""
 "Nombre maximum de jours d'historique demandé au serveur lorsqu'un salon "
 "privé est rejoint. 0 : Autant que possible"
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
+"Si activé, Gajim montre le sujet du groupe de discussion dans la fenêtre de "
+"discussion lors de la connexion"
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3326,14 +3284,14 @@ msgid ""
 msgstr ""
 "Si la liste de contact est colorée selon l’état de discussion du contact"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "Si l’étiquette est colorée selon l’état de discussion du contact"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3342,7 +3300,7 @@ msgstr ""
 "Montrez le texte dans la bannière comme indiqué dans l’état de discussion du "
 "contact"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3351,7 +3309,7 @@ msgstr ""
 "Notifications d'état qui sont envoyées au salon de discussion. Peut être "
 "all, composing_only ou disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3360,30 +3318,34 @@ msgstr ""
 "Notifications d'état qui sont envoyées au salon de discussion. Peut être "
 "all, composing_only ou disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
-msgstr ""
+msgstr "Préférences de l'API. Valeurs possibles : 'http', 'iq'"
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
-msgstr ""
+msgstr "Sélectionner le texte le copiera dans le presse-papiers"
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 #, fuzzy
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr "Si activé, Gajim exécutera les commandes de la XEP-0146."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 #, fuzzy
 msgid "Width of group chat roster in pixel"
 msgstr "Inviter des amis dans un salon de discussion ou en rejoindre un"
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Nom du marque-page"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3392,7 +3354,7 @@ msgstr ""
 "La priorité va changer automatiquement selon votre état. Les priorités sont "
 "définies dans les options autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3404,12 +3366,12 @@ msgstr ""
 "(Occupé⋅e) ou Invisible. NOTE : cette option n'est utilisée que si l'option "
 "restore_last_status est désactivée"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Si activé, restaure le dernier statut qui était utilisé."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
@@ -3417,7 +3379,7 @@ msgstr ""
 "Si activé, les demandes d'autorisation des contacts seront automatiquement "
 "acceptées."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3426,12 +3388,12 @@ msgstr ""
 "Si désactivé, ce compte sera désactivé et n'apparaîtra plus dans votre liste "
 "de contacts."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Vous n’êtes pas connecté au serveur"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3441,15 +3403,15 @@ msgstr ""
 "connexion non-chiffrée. Peut prendre les valeurs 'warn', 'connect', "
 "'disconnect'"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr "Liste des erreurs SSL à ignorer (séparées par des espaces)."
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
-msgstr ""
+msgstr "ConnectionType: START TLS, DIRECT TLS ou PLAIN"
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
@@ -3460,7 +3422,7 @@ msgstr ""
 "enregistrer les conversations. Vous pouvez également ajouter le nom d'un "
 "compte pour ne rien enregistrer pour ce compte."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3469,7 +3431,7 @@ msgstr ""
 "Nombre de secondes d'attente pour la réponse du paquet d'entretien de "
 "connexion avant de tenter de se reconnecter ?"
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3479,7 +3441,7 @@ msgstr ""
 "mandataires définis dans l'option file_transfer_proxies pour les transferts "
 "de fichiers."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 #, fuzzy
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
@@ -3489,30 +3451,30 @@ msgstr ""
 "au démarrage pour être sûr qu'ils fonctionnent. Les serveurs mandataires de "
 "Openfire sont connus pour échouer à ce test, même s'ils fonctionnent."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Si activé, Gajim affichera un icône montrant que les messages envoyés ont "
 "été reçus par votre contact"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Si cette case est cochée, Gajim autorisera les autres à détecter le système "
 "d'exploitation que vous utilisez"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Autorise Gajim à envoyer votre heure."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Message à envoyer aux contacts que vous souhaitez ajouter"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3521,7 +3483,7 @@ msgstr ""
 "Si activé, Gajim enverra vos IPs publiques pour que vos contacts puissent se "
 "connecter à votre machine pour les transfert de fichiers."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
@@ -3530,12 +3492,7 @@ msgstr ""
 "Liste de jid, séparée par un espace, pour lesquels vous voulez rouvrir la "
 "fenêtre de discussion au prochain démarrage."
 
-#: gajim/common/config.py:349
-#, fuzzy
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr "Envoie par HTTP : Activer la vérification HTTPS"
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 #, fuzzy
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
@@ -3544,12 +3501,12 @@ msgstr ""
 "Mécanisme de transfert préféré pour le cliquer-déposer sur une fenêtre de "
 "discussion. Peut être 'httpupload' (par défault) ou 'jingle'"
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Autorise la vérification de certificat avec POSH"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3558,18 +3515,18 @@ msgstr ""
 "Notifications d'état qui sont envoyées au salon de discussion. Peut être "
 "all, composing_only ou disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Chiffrement actuellement actif pour ce contact"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 #, fuzzy
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr "Indique si l'on veut une notification pour chaque message de ce salon"
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
@@ -3578,14 +3535,14 @@ msgstr ""
 "Montre l’état du message pour tous les changements d’état des utilisateurs "
 "du groupe de discussion"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr ""
 "Montre le message d’état pour toute connexion ou déconnexion au groupe de "
 "discussion"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 #, fuzzy
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
@@ -3594,14 +3551,14 @@ msgstr ""
 "Si le salon de discussion est réduit dans la liste de contacts à la "
 "connexion automatique"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr "Si le salon de discussion est réduit à la fermeture de la conversation"
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3610,7 +3567,7 @@ msgstr ""
 "Notifications d'état qui sont envoyées au salon de discussion. Peut être "
 "all, composing_only ou disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3621,83 +3578,83 @@ msgstr ""
 "s’éteint). Cette option NE DOIT PAS être utilisée pour (dés)activer un "
 "plugin. Utiliser l'interface graphique pour cela."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Dort"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Mange"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 msgid "I'm eating."
 msgstr "Je suis entrain de manger."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Travaille"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Téléphone"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Dehors"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Disponible"
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3706,123 +3663,123 @@ msgstr ""
 "Son à jouer lorsqu'un message de salon contient un des mots de "
 "muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Son émis lors de l'arrivée d'un message de salon de discussion."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Aucun"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Support des salons de discussion"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Message d'un salon mis en surbrillance :"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Invitation à un salon"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Invitation à un salon"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Marque-pages des salons de discussion"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Support des salons de discussion"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Aucun"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "La création de salon n’est pas autorisée."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Créer un salon de discussion"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Le service n'a pu être trouvé"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr "Pas de réponse du serveur distant"
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
 msgstr "L’adresse n’est pas un serveur de salons de discussion"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Ce compte existe déjà localement."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
 msgstr "Le salon n’existe pas"
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Groupes de discussion"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr "Ce message a été chiffre avec OTR et ne peux pas être déchiffré."
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -3830,7 +3787,7 @@ msgstr ""
 "Ce message a été chiffre avec l'ancien OpenPGP et ne peux pas être "
 "déchiffré. Vous pouvez installer le plugin PGP pour gérer ces messages."
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 #, fuzzy
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
@@ -3839,920 +3796,919 @@ msgstr ""
 "Ce message a été chiffre avec l'ancien OpenPGP et ne peux pas être "
 "déchiffré. Vous pouvez installer le plugin PGP pour gérer ces messages."
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr "Ce message a été chiffre avec %s et ne peux pas être déchiffré."
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Fait des corvées"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Achète des provisions"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Fait le ménage"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Cuisine"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Fait de la maintenance"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Fait la vaisselle"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Lave le linge"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Jardine"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Fait une course"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Promène le chien"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Boit"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Prend une bière"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Prend un café"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Prend un thé"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Prend un snack"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Prend le petit-déjeuner"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Soupe"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Dîne"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Fait de l'exercice"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Fait du vélo"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Danse"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Fait de la randonnée"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Fait un jogging"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Fait du sport"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Court"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Skie"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Nage"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "S'entraine"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Se toilette"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "À la station thermale"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Se brosse les dents"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Se fait couper les cheveux"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Se rase"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Prend un bain"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Prend une douche"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "A un rendez-vous"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inactif"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "En congé"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Traîne"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Se cache"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Fait une prière"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "En vacances organisées"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Réfléchit"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Se relaxe"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Pêche"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Joue"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Sort"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Fait la fête"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Lit"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Se prépare"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Fait les magasins"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Fume"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Se socialise"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Prend un bain de soleil"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Regarde la télé"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Regarde un film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Discute"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "Dans la vraie vie"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Au téléphone"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "En visioconférence"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Voyage"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Fait la navette"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Conduit"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "En voiture"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "En bus"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "En avion"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "En train"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "En séjour"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Marche"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Code"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "En réunion"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Étudie"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Écrit"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Effrayé⋅e"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Épaté⋅e"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Amoureux(se)"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "En colère"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Ennuyé⋅e"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Anxieux(se)"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Excité⋅e"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Honteux(se)"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Ennuyé⋅e"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Courageux(se)"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Calme"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Prudent⋅e"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Froid⋅e"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Confiant⋅e"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Confus⋅e"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Contemplatif(ve)"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Satisfait⋅e"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Grincheux(se)"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Cinglé⋅e"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Créatif(ve)"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Curieux(se)"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Découragé⋅e"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Déprimé⋅e"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Déçu⋅e"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Écœuré⋅e"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Estomaqué⋅e"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Distrait⋅e"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Embarrassé⋅e"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Envieux(se)"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Excité⋅e"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Dragueur(se)"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustré⋅e"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Reconnaissant⋅e"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "En deuil"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Grognon(ne)"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Coupable"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Heureux(se)"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "optimiste"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Bouillant⋅e"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Humble"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Humilié⋅e"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Affamé⋅e"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Blessé⋅e"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Impressionné⋅e"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Craintif(ve)"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Amoureux(se)"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Indigné⋅e"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Intéressé⋅e"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Intoxiqué⋅e"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Invincible"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Jaloux(se)"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Solitaire"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Perdu⋅e"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Chanceux(se)"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Méchant⋅e"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Morose"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nerveux(se)"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutre"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Outré⋅e"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Scandalisé⋅e"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Enjoué⋅e"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Fier/Fière"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Détendu⋅e"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Soulagé⋅e"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Plein⋅e de remords"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Impatient⋅e"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Triste"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarcastique"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Satisfait⋅e"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Concentré⋅e"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Choqué⋅e"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Timide"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Malade"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Endormi⋅e"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontané⋅e"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Stressé⋅e"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Fort⋅e"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Surpris⋅e"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Reconnaissant⋅e"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Assoiffé⋅e"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Fatigué⋅e"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Faible"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Inquiet⋅e"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "précision"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "alt"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "zone"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "position"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "bâtiment"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "pays"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "code du pays"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "donnée"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "description"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "erreur"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "étage"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "lat"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "ville"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "lon"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "code postal"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "région"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "groupe de discussion"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "vitesse"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "rue"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "texte"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "horodatage"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Impossible d'obtenir le certificat de l'émetteur"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Impossible d'obtenir un certificat CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossible de déchiffrer la signature du certificat"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Impossible de déchiffrer la signature du CRL"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de déchiffrer la clef public de l'émetteur"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Échec de la signature du certificat"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Échec de la signature CRL"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Le certificat n'est pas encore valide"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Le certificat a expiré"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL n'est pas encore valide"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL a expiré"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Erreur de format dans le champ notBefore du certificat"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Erreur de format dans le champ notAfter du certificat"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erreur de format dans le champ lastUpdate du CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erreur de format dans le champ nextUpdate du CRL"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Certificat auto-signé"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificat auto-signé dans la chaîne de certificat"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Impossible de récupérer le certificat de l'émeteur local"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Impossible de vérifier le premier certificat"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Chaîne du certificat trop longue"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certificat révoqué"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Certificat CA invalide"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Longueur du chemin dépassée"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Objet du certificat non-supporté"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certificat non approuvé"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certificat refusé"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Décalage du sujet de l'émetteur"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Décalage dans les clés d'identification de l'authorité et du sujet"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Décalage dans les numéros de série de l'authorité et du sujet"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certificat révoqué"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 msgid "Unknown validation error"
 msgstr "Erreur de validation inconnue"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Le certificat a expiré"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorisation acceptée"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Compte désactivé"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Certificat Oauth2"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Erreur du chiffrement"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Extension non supportée"
 
-#: gajim/common/const.py:909
-#, fuzzy
+#: gajim/common/const.py:942
 msgid "Authentication mechanism too weak"
-msgstr "Echec de l'authentification avec \"%s\""
+msgstr "Mécanisme d'authentification trop faible"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4794,7 +4750,7 @@ msgstr "Test vidéo"
 
 #: gajim/common/multimedia_helpers.py:107
 msgid "Pipewire"
-msgstr ""
+msgstr "Pipewire"
 
 #: gajim/common/multimedia_helpers.py:109
 #, python-format
@@ -4803,22 +4759,22 @@ msgstr "V4L2 : %s"
 
 #: gajim/common/multimedia_helpers.py:111
 msgid "X11"
-msgstr ""
+msgstr "X11"
 
 #: gajim/common/multimedia_helpers.py:113
 msgid "Windows"
-msgstr ""
+msgstr "Windows"
 
 #: gajim/common/multimedia_helpers.py:115
 msgid "macOS"
-msgstr ""
+msgstr "macOS"
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s erreur de configuration"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4837,288 +4793,247 @@ msgstr ""
 "L'error était :\n"
 "%(error)s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "Entrée audio"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "Sortie audio"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "Entrée vidéo"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Le serveur doit comprendre entre 1 et 1023 octets"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Caractère non valide dans le nom d'hôte."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Adresse du serveur requise."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Le nom d'utilisateur doit comprendre entre 1 et 1023 octets"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Caractère non valide dans le nom d'utilisateur."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "La ressource doit comprendre entre 1 et 1023 octets"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Caractère non valide dans la ressource."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Occupé⋅e"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Occupé⋅e"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "?user status:_Disponible"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "?user status:Disponible"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Connexion"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Absent⋅e"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Absent⋅e"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Déconnecté⋅e"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Déconnecté⋅e"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "À"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Les deux"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Aucune"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Propriétaire"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrateur"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Membre"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membre"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 msgid "is composing a message…"
 msgstr "écrit un message…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message en attente"
 msgstr[1] "%d messages en attente"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, python-format
 msgid "from group chat %s"
 msgstr "depuis le salon de discussion %s"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr "de l'utilisateur %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d évènement en attente"
 msgstr[1] "%d événements en attente"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Bonjour, je m'appelle $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Délai du chargement de l'image dépassé"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "PyCURL n'est pas installé"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "Erreur lors du chargement de l'image"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s est un fichier mais devrait être un répertoire"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
@@ -5221,82 +5136,82 @@ msgstr "La machine se met en veille"
 msgid "Disconnect from the network"
 msgstr "Déconnecté du réseau"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Le fichier est vide"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr "Fichier trop gros, la taille maximum autorisée est : %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 msgid "Encrypting file…"
 msgstr "Chiffrement du fichier …"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr "Demande d'envoi de fichier par HTTP…"
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr "Envoi du fichier via l’envoi de fichiers par HTTP…"
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Modifier les informations du statut"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Modifier le statut"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Choisissez le type de présence et la description"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Disponible pour Discuter"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Connecté"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Longue absence"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Ne pas déranger"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Hors-ligne - Déconnecté⋅e"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Description de la présence :"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "L'état a été changé."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Contact envoyé : « %(jid)s » (%(name)s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Contacts envoyés :"
 
@@ -5320,7 +5235,7 @@ msgid "Join Automatically"
 msgstr "_Rejoindre automatiquement"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Compte"
 
@@ -5331,7 +5246,7 @@ msgstr "Salons de discussion"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -5351,7 +5266,7 @@ msgstr "Salons de discussion récemment utilisés"
 msgid "Search group chats on selected server"
 msgstr "Chercher les salons sur le serveur selectionné"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
 msgstr "Rejoindre"
 
@@ -5368,17 +5283,17 @@ msgid "Time remaining"
 msgstr "Temps restant"
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Annuler"
 
@@ -5521,7 +5436,7 @@ msgstr "Informations du Contact"
 # ccount). Description column
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Description"
 
@@ -5702,42 +5617,49 @@ msgstr "Emploi"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "À propos"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Rejoindre un salon de discussion"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 msgid "_Back"
 msgstr "Retour"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "Re_joindre"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
 msgstr "Sélectionner un compte"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "Sélectionner des fichiers"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
 msgstr ""
+"Pas de contacts trouvés\n"
+"Vous pouvez aussi écrire une adresse XMPP"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
@@ -5803,6 +5725,7 @@ msgid "Strike"
 msgstr "Barré"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Couleur"
 
@@ -5814,132 +5737,126 @@ msgstr "Police"
 msgid "Clear formatting"
 msgstr "Effacer le formatage"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 msgid "Choose encryption"
 msgstr "Choisir un chiffrement"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Afficher une liste des émojis (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:509
 msgid "Joining…"
-msgstr "Bannissement de …"
+msgstr "Connexion…"
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 msgid "Enter new nickname"
 msgstr "Saisissez un nouveau pseudonyme"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Changer de surnom"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Changer le sujet"
+
+#: gajim/data/gui/groupchat_control.ui:786
 msgid "Enter password"
 msgstr "Saisissez un mot de passe"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Quitter le groupe de discussion"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/data/gui/groupchat_control.ui:1018
-#, fuzzy
-msgid "An error occured"
-msgstr "<b>Une erreur est survenue :</b>"
+#: gajim/data/gui/groupchat_control.ui:1063
+msgid "An error occurred"
+msgstr "Une erreur est survenue"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Vérifier à nouveau..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Participant"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Éjecter"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 #, fuzzy
 msgid "Insert Emoji"
 msgstr "_Convertir les emoji ASCII"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr " (facultatif) ..."
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Participant"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Bannir"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Détruire le salon de discussion"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 msgid "_Destroy"
 msgstr "_Détruire"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr " (facultatif) ..."
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr "Raison de la destruction"
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 #, fuzzy
 msgid "Where participants should go"
 msgstr "Où est-ce que les participants devraient aller (facultatif)"
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
 msgstr "Entrez un nouveau nom pour ce salon"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Inviter"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Type d'événement"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Événement"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -6023,18 +5940,18 @@ msgid "Add"
 msgstr "Ajouter"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 msgid "Remove"
 msgstr "Supprimer"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 msgid "Resource"
 msgstr "Ressource"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "État"
 
@@ -6043,7 +5960,7 @@ msgid "Client"
 msgstr "Client"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "Système"
 
@@ -6174,25 +6091,16 @@ msgstr "Comportement de la _fenêtre"
 msgid "_Show contact list on startup"
 msgstr "Montrer la _liste au démarrage"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr "Montrer l'avatar dans les onglets de la fenêtre de discussion"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-"Si vérifié, l'avatar du contact sera montré dans les onglets de discussions"
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr "Emplacement des _onglets"
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 #, fuzzy
 msgid "_Quit Gajim when closing contact list"
 msgstr "_Quitter Gajim quand la fenêtre de la liste des contacts est fermée"
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 #, fuzzy
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
@@ -6201,16 +6109,25 @@ msgstr ""
 "Si activé, Gajim se fermera quand la fenêtre de la liste des contacts est "
 "fermée, au lieu de se minimiser dans la zone des notifications du système"
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr "Comportement des fenêtres et des onglets"
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Regrouper les comptes"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr "Montrer tout vos comptes fusionnés en un seul"
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Afficher les a_vatars des contacts dans la liste des contacts"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6219,12 +6136,12 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre des contacts et les salons de discussion"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Afficher les _messages d'état des contacts dans la liste des contacts"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6234,7 +6151,7 @@ msgstr ""
 "sous le nom du contact, dans la fenêtre de la liste des contacts et les "
 "salons de discussion"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
@@ -6242,7 +6159,7 @@ msgstr ""
 "Afficher les informations _supplémentaires des contacts dans la liste des "
 "contacts (humeur, activité, …)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 #, fuzzy
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
@@ -6254,39 +6171,39 @@ msgstr ""
 "additionnelles (publiées au moyen de PEP) peuvent être par exemple humeur, "
 "activité, musique, emplacement, …"
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Trier les contacts par état"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Contacts envoyés :"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "dans les _salons de discussion"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Échange d'éléments de la liste des contacts"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr "Activer la copie automatique"
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr "Activer la _vérification orthographique"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6298,11 +6215,11 @@ msgstr ""
 "définie explicitement par clique droit sur le champ de saisie, la langue par "
 "défaut sera utilisée pour ce contact ou ce salon. gspell doit être installé."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 msgid "Show message recei_pts (✔)"
 msgstr "Afficher les accusés de réception (✔)"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
@@ -6312,16 +6229,16 @@ msgstr ""
 "message quand il a été reçu. Notez que ceci n'est pas supporté par tous les "
 "clients et peut donc être trompeur."
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Afficher une liste de styles"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 msgid "Display status messages in _single chats"
 msgstr "Afficher les messages d'état dans les _discussions"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
@@ -6329,26 +6246,26 @@ msgstr ""
 "Si cette case est cochée, les lignes d'état seront affichées dans les "
 "conversations quand un contact modifie son état ou son message d'état"
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 msgid "Show subject after _joining a group chat"
 msgstr "Montrer le sujet après avoir _rejoint un salon de discussion"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr ""
 "Si cette case est cochée, le sujet du salon sera montré à l'entrée dans un "
 "salon de discussion"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 msgid "Group Chat Settings"
 msgstr "Paramètres des salons de discussions"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr "Montrer rejoindre/partir (par défaut)"
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 #, fuzzy
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
@@ -6358,7 +6275,7 @@ msgstr ""
 "paramètre peut être supplanté dans le menu du salon."
 
 # supplanté, outrepassé, ignoré, écrasé ?
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 #, fuzzy
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
@@ -6367,15 +6284,15 @@ msgstr ""
 "Le seuil de synchronisation par défaut pour les nouveaux salons de "
 "discussion publiques. Ce paramètre peut être supplanté dans le menu du salon."
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr "Seuil de synchronisation par défaut"
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 msgid "Show status changes (Default)"
 msgstr "Afficher les modifications d'état (par défaut)"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 #, fuzzy
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
@@ -6384,11 +6301,11 @@ msgstr ""
 "Si les messages de changement d'état sont montrés sans le salon de "
 "discussion. Ce paramètre peut être supplanté dans le menu du salon."
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 msgid "Show chatstate in tabs"
 msgstr "Afficher l'état de la discussion dans les onglets"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
@@ -6396,12 +6313,12 @@ msgstr ""
 "Si cette case est cochée, l'onglet sera coloré suivant l’état actuel de "
 "discussion de votre contact"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Afficher l'état de la discussion dans les onglets"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
@@ -6409,52 +6326,53 @@ msgstr ""
 "Si cette case est cochée, la liste de contact sera colorée selon l’état de "
 "discussion du contact"
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr "Montrer l’état de discussion dans la bannière"
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
 "Si cette case est cochée, une description de l’état de discussion des "
 "contacts sera montrée dans la bannière"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 msgid "Chatstate"
 msgstr "État de discussion"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Discussion"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 msgid "Show _notification area icon"
 msgstr "Montrer l’icône de la zone de _notification"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 msgid "_When new event is received"
 msgstr "_Quand un nouvel événement est reçu"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Montrer les notifications lorsqu'une fenêtre de discussion est déjà _ouverte"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Autoriser les fenêtres de notifications lorsque je suis _absent⋅e/"
 "indisponible/occupé⋅e ou invisible"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Me signaler les contacts qui se _connectent"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
@@ -6462,11 +6380,11 @@ msgstr ""
 "Une fenêtre de notification apparaîtra en bas à droite de l'écran quand un "
 "contact se connecte "
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Me signaler les contacts qui se _déconnectent"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
@@ -6474,36 +6392,36 @@ msgstr ""
 "Une fenêtre de notification apparaîtra en bas à droite de l'écran quand un "
 "contact se déconnecte "
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Notifications visuelles"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "_Jouer les sons"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "_Gérer..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Autoriser les sons quand je suis _occupé⋅e"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 msgid "Sounds"
 msgstr "Sons"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Notifications"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 msgid "No_t Available"
 msgstr "Non disponible"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
@@ -6511,7 +6429,7 @@ msgstr ""
 "Si cette case est cochée, Gajim changera votre statut en Non disponible "
 "quand l'ordinateur n'a pas été utilisé pendant la durée spécifiée"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
@@ -6519,7 +6437,7 @@ msgstr ""
 "Si cette case est cochée, Gajim changera votre statut en Non disponible "
 "quand l'ordinateur n'a pas été utilisé pendant la durée spécifiée"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6531,7 +6449,7 @@ msgstr ""
 "$S sera remplacé par l’ancien message de statut.\n"
 "$T sera remplacé par le temps d'absence."
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6543,19 +6461,19 @@ msgstr ""
 "$S sera remplacé par l’ancien message de statut.\n"
 "$T sera remplacé par le temps de non-activité."
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 msgid "Minutes"
 msgstr "Minutes"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 msgid "Automatic Status"
 msgstr "Statut automatique"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr "_Se rappeler et restaurer le statut de la dernière session"
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
@@ -6563,19 +6481,19 @@ msgstr ""
 "Si cette case est cochée, l'état et le message d'état de la dernière session "
 "seront rétablis"
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 msgid "Ask for status message when I"
 msgstr "Demander le message d'état lorsque je me"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6583,60 +6501,60 @@ msgstr ""
 "Si cette case est cochée, Gajim ne demandera pas de message de statut. Le "
 "message par défaut sera utilisé à la place."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Message par défaut"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Activé"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 msgid "Status Messages"
 msgstr "Messages d'état"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Messages d'état prédéfinis"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 msgid "Themes"
 msgstr "Thèmes"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 msgid "_Theme"
 msgstr "_Thème"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Paramétrer la couleur et la police de texte de l'interface"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 msgid "_Dark Theme"
 msgstr "Thème _foncé"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr "Emojis"
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 msgid "_Emoji Theme"
 msgstr "Thèmes d'Emoji"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr "Icônes"
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 msgid "_Status iconset"
 msgstr "_Icônes d'état"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 msgid "Use transports _icons"
 msgstr "Utiliser les _icônes des passerelles"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
 "ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)"
@@ -6645,66 +6563,66 @@ msgstr ""
 "protocoles. (Par ex. un contact ICQ aura les icônes de ICQ pour les états "
 "disponible, absent, occupé, etc.)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr "_Convertir les emoji ASCII"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Style"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Fonctionnalités"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr "Périphérique audio de sortie"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr "Périphérique audio d’entrée"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr "Audio"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr "Vidéo"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 msgid "_Video input device"
 msgstr "Périphérique d'entrée vidéo"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Sortie audio"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr "Images par seconde"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr "Taille de la vidéo"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr "Voir votre propre source vidéo"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Connexion"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 msgid "STU_N server"
 msgstr "Serveur STUN"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
@@ -6712,50 +6630,60 @@ msgstr ""
 "Nom d’hote du serveur STUN. Si aucun n’est spécifié, Gajim tentera\n"
 "d’en découvrir un à partir du serveur. (Exemple: stun.iptel.org)"
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr "Audio/Vidéo"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr "_Serveur mandataire global"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Gérer..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "Inscrire dans l'_historique les changements d'état des contacts"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 #, fuzzy
 msgid "Enable _debug logging (restart required)"
 msgstr "Activer les logs de débogage"
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr ""
 "Si cette case est cochée, Gajim stockera un fichier de log pour le débogage"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr "Attention : utilisez ces options avec précaution !"
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Éditeur de configuration avancé (ECA)"
 
@@ -6909,7 +6837,7 @@ msgstr "_Type"
 
 #: gajim/data/gui/account_wizard.ui:203
 msgid "Welcome"
-msgstr ""
+msgstr "Bienvenue"
 
 #: gajim/data/gui/account_wizard.ui:219
 #, fuzzy
@@ -6918,7 +6846,7 @@ msgstr "Veuillez saisir un nouveau nom"
 
 #: gajim/data/gui/account_wizard.ui:237
 msgid "Your XMPP address (e.g. user@example.org)"
-msgstr ""
+msgstr "Votre adresse XMPP (e.g. utilisateur@exemple.org)"
 
 #: gajim/data/gui/account_wizard.ui:239
 #: gajim/data/gui/single_message_window.ui:59
@@ -6930,19 +6858,19 @@ msgstr "utilisateur@exemple.org"
 msgid "Your password"
 msgstr "Saisissez un mot de passe"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Paramètres"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
 #: gajim/data/gui/account_wizard.ui:283
 msgid "_Log In"
-msgstr ""
+msgstr "_Connexion"
 
 #: gajim/data/gui/account_wizard.ui:288
 msgid "Log in with your credentials"
@@ -6964,7 +6892,7 @@ msgstr ""
 
 #: gajim/data/gui/account_wizard.ui:369
 msgid "Visit Website"
-msgstr ""
+msgstr "Visitez le site Web"
 
 #: gajim/data/gui/account_wizard.ui:410
 #, fuzzy
@@ -7000,7 +6928,7 @@ msgstr ""
 
 #: gajim/data/gui/account_wizard.ui:530
 msgid "Visit Server's Website"
-msgstr ""
+msgstr "Visiter le site Web du serveur"
 
 #: gajim/data/gui/account_wizard.ui:550
 msgid "Listing of Servers"
@@ -7010,6 +6938,7 @@ msgstr ""
 msgid ""
 "<a href='https://xmpp.org/getting-started/'>xmpp.org/getting-started</a>"
 msgstr ""
+"<a href='https://xmpp.org/getting-started/'>xmpp.org/getting-started</a>"
 
 #: gajim/data/gui/account_wizard.ui:586
 msgid "A Feature Comparison of Various Servers"
@@ -7020,8 +6949,10 @@ msgid ""
 "<a href='https://conversations.im/compliance/'>conversations.im/compliance</"
 "a>"
 msgstr ""
+"<a href='https://conversations.im/compliance/'>conversations.im/compliance</"
+"a>"
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_connecte"
@@ -7035,7 +6966,7 @@ msgstr "Veuillez choisir un surnom"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7064,8 +6995,8 @@ msgstr "_Réinitialiser aux valeurs par défaut"
 msgid "Resets value to default"
 msgstr "_Réinitialiser aux valeurs par défaut"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
@@ -7106,7 +7037,7 @@ msgstr "Voir le certificat…"
 msgid "Proxy Host"
 msgstr "Hôte du serveur mandataire"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Type"
 
@@ -7119,8 +7050,7 @@ msgstr "_Protocole"
 msgid "Copy info to clipboard"
 msgstr "Copier l'information dans le presse-papier"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Fonctionnalités"
 
@@ -7288,6 +7218,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Changer le message d'état…"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humeur :</b>"
@@ -7358,9 +7293,10 @@ msgid "Installed"
 msgstr "Installé"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "La description du plugin doit se trouver ici. Ce teste sera effacé lors de "
 "l'initialisation de la fenêtre de plugins."
@@ -7497,7 +7433,7 @@ msgstr "Informations du serveur"
 #: gajim/data/gui/manage_proxies.ui:12
 msgctxt "proxy configuration"
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
 #: gajim/data/gui/manage_proxies.ui:15
 #, fuzzy
@@ -7539,71 +7475,104 @@ msgstr "Paramètres"
 msgid "_Name"
 msgstr "_Nom"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 msgid "Proxy"
 msgstr "Serveur mandataire"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Commencer une discussion"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
-msgid "Create Group Chat"
+#, fuzzy
+msgid "Create _Group Chat…"
 msgstr "Créer un groupe de discussion"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Gestionnaire d'historique"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Plugins"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
-msgstr "Préférences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+msgid "_Preferences"
+msgstr "_Préférences"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "Quitter"
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Comptes"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
+#, fuzzy
+msgid "_View"
 msgstr "Affichage"
 
-#: gajim/data/gui/application_menu.ui:42
-msgid "Show Contact List"
-msgstr "Afficher la liste des contacts"
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
+msgid "Show _Contact List"
+msgstr "Affiche_r la liste des contacts"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
+#, fuzzy
+msgid "Show _Offline Contacts"
 msgstr "Afficher les Contacts déconnectés"
 
 #: gajim/data/gui/application_menu.ui:50
-msgid "Show Active Contacts"
+#, fuzzy
+msgid "Show _Active Contacts"
 msgstr "Afficher les contacts actifs"
 
 #: gajim/data/gui/application_menu.ui:54
-msgid "Show Transports"
+#, fuzzy
+msgid "Show _Transports"
 msgstr "Afficher les passerelles"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Console XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Transfert de fichiers"
+
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
+#, fuzzy
+msgid "_Help"
 msgstr "Aide"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Connecté"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Connecté"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Fonctionnalités"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "À propos"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr "Public ou privé ?"
@@ -7618,6 +7587,10 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+msgid "Create Group Chat"
+msgstr "Créer un groupe de discussion"
+
 # ccount). Description column
 #: gajim/data/gui/groupchat_creation.ui:122
 msgid "_Description"
@@ -7625,7 +7598,7 @@ msgstr "_Description"
 
 #: gajim/data/gui/groupchat_creation.ui:164
 msgid "_Public"
-msgstr ""
+msgstr "_Publique"
 
 #: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
@@ -7892,54 +7865,62 @@ msgstr "Raccourcis de la fenêtre de discussion"
 msgid "Create new group chat"
 msgstr "Créer un groupe de discussion"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Préférences"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Plugins"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 msgid "File transfers"
 msgstr "Transferts de fichiers"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr "Définir le message d'état"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Montrer la console _XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Apparence"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Afficher les contacts déconnectés"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 msgid "Show only active contacts"
 msgstr "Afficher seulement les contacts actifs"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 #, fuzzy
 msgid "Enable contact list filtering"
 msgstr "Activer le filtrage de la liste"
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Afficher seulement les contacts actifs"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Contacts"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "Informations sur le contact"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr "Renommer le contact"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "Supprimer le contact"
 
@@ -7990,9 +7971,10 @@ msgid "Search contacts..."
 msgstr "Recherche dans la base de données..."
 
 #: gajim/data/gui/groupchat_invite.ui:223
-#, fuzzy
 msgid "Click on contacts you would like to invite to this group chat."
-msgstr "%(jid)s a été invité dans ce salon"
+msgstr ""
+"Cliquez sur les contacts que vous souhaitez inviter à cette discussion de "
+"groupe."
 
 #: gajim/data/gui/manage_pep_services_window.ui:46
 msgid "Configure"
@@ -8010,12 +7992,16 @@ msgstr "Remplissez le formulaire."
 msgid "Group Chat Configuration"
 msgstr "Configuration du salon de discussion"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Console XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "Commencer une discussion..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "Filtre"
 
@@ -8058,10 +8044,6 @@ msgstr "Montrer les _événements en attente"
 msgid "Mute Sounds"
 msgstr "Désactiver les sons"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-msgid "_Preferences"
-msgstr "_Préférences"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8395,126 +8377,126 @@ msgstr "%(progress)s sur %(total)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr "%(minutes)s min %(seconds)s sec"
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Aucun"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
 msgstr "N’importe qui pourra rejoindre ce salon de discussion"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Message d'un salon mis en surbrillance :"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 #, fuzzy
 msgid "This group chat is restricted to members only"
 msgstr "Si le salon de discussion est réduit à la fermeture de la conversation"
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Support des salons de discussion"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 "Tous les autres participants au groupe de discussion peut voir votre adresse "
 "XMPP"
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Message d'un salon mis en surbrillance :"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr "Seuls les modérateurs peuvent voir l’adresse XMPP"
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Aucun"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Support des salons de discussion"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Message d'un salon mis en surbrillance :"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Aucun"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Ceci ne peut pas être annulé."
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Support des salons de discussion"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Support des salons de discussion"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Support des salons de discussion"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Aucun"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Invitation à un salon"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Cette session sera archivée sur le serveur"
@@ -8543,7 +8525,7 @@ msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Destinataire : "
 
@@ -8698,7 +8680,7 @@ msgstr "Fichier : "
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Expéditeur : "
 
@@ -8712,7 +8694,7 @@ msgid "Change"
 msgstr "Changer de surnom"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 msgid "Back"
 msgstr "Précédent"
 
@@ -8742,11 +8724,12 @@ msgid "Password Change Failed"
 msgstr "Mot de passe requis"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Une erreur est survenue lors de la création du compte"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -8783,41 +8766,37 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Erreur SSL inconnue '%s'"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Démarrer une nouvelle conversation"
+msgid "Start / Join Chat"
+msgstr "Commencer une discussion"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas "
 "connecté."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-msgid "Add Contact"
-msgstr "Ajouter un contact"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, python-format
 msgid "%s group chats found"
 msgstr "%s groupes de discussion trouvés"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Ce service n'a pas encore renvoyé d'informations détaillées"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8826,32 +8805,32 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Autres"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 msgid "Group Chat"
 msgstr "Salon de discussion"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8859,141 +8838,141 @@ msgstr ""
 "Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. "
 "Veuillez vérifier l'adresse et réessayer."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Ce type de service ne contient pas d'élément à parcourir."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Nom de serveur invalide"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Parcourt %(address)s en utilisant le compte %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr "Parcourir"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 msgid "_Command"
 msgstr "_Commande"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Rechercher"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "É_dition"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Scanne %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Inscrit"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Nœud"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nouvel article"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Envoyer un _message simp…"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 msgid "(No subject)"
 msgstr "(Aucun sujet)"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Message simple"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr "Caractères saisis : %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr ""
 "Il n'est pas possible d'envoyer un message à %s, ce JID n'est pas valide."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
@@ -9039,30 +9018,11 @@ msgstr "L'inscription a réussi"
 msgid "Registration failed"
 msgstr "L'inscription a échoué"
 
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Dictionnaire pour la langue \"%s\" indisponible"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Vous devez installer le dictionnaire \"%s\" pour la vérification "
-"orthographique, ou choisir un autre langage en paramétrant l'option "
-"speller_language.\n"
-"\n"
-"Le soulignement des fautes d'orthographe ne sera pas utilisé"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 msgid "Certificate"
 msgstr "Certificat"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
@@ -9071,57 +9031,57 @@ msgstr ""
 "Certificat pour le compte\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr "Émis à\n"
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr "Nom commun (NC) : "
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr "Organisation (O) : "
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr "Organisation (O) : "
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
 msgstr "Numéro de série : "
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr "Émis par\n"
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr "Validité\n"
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr "Émis le : "
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr "Expire le : "
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 #, fuzzy
 msgid "SHA-1:"
 msgstr "SHA-1"
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 #, fuzzy
 msgid "SHA-256:"
 msgstr "SHA-256"
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 msgid "Group Chat Invitation "
 msgstr "Invitation à un salon "
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
@@ -9129,7 +9089,7 @@ msgstr ""
 "<b>%(contact)s</b> vous a invité dans le salon de discussion <b>"
 "%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
@@ -9142,6 +9102,10 @@ msgstr "Numéro GG"
 msgid "ICQ Number"
 msgstr "Numéro ICQ"
 
+#: gajim/gtk/add_contact.py:42
+msgid "Add Contact"
+msgstr "Ajouter un contact"
+
 #: gajim/gtk/add_contact.py:260
 #, python-format
 msgid "%s Missing"
@@ -9191,9 +9155,9 @@ msgid "Error while adding transport contact"
 msgstr "Erreur en ajoutant un contact d'un transport"
 
 #: gajim/gtk/add_contact.py:486
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9336,28 +9300,48 @@ msgstr "Arrière plan du contact déconnecté"
 msgid "Contact Connected Background "
 msgstr "Arrière plan du contact connecté "
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Couleur du message d'état"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Couleur du message d'état"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Couleur du message d'état"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Couleur du message d'état"
+
+#: gajim/gtk/themes.py:187
 msgid "Gajim Themes"
 msgstr "Thèmes de Gajim"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 msgid "Invalid Name"
 msgstr "Nom invalide"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr "Le nom <b>default</b> n'est pas autorisé"
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 msgid "Spaces are not allowed"
 msgstr "Les espaces ne sont pas autorisés"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Voulez-vous supprimer ce thème de façon permanente ?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
@@ -9365,11 +9349,11 @@ msgstr ""
 "C'est le thème que vous utilisez actuellement.\n"
 "Voulez vous supprimer ce thème ?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 msgid "Delete Theme"
 msgstr "Supprimer le thème"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Paramètres de connexion"
@@ -9393,10 +9377,9 @@ msgid "Error: %s"
 msgstr "Erreur : %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Erreur"
 
@@ -9410,43 +9393,43 @@ msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "Ouvrir"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 msgid "Clear File"
 msgstr "Effacer le fichier"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
 msgstr "Gérer les serveurs mandataires"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 msgid "No Proxy"
 msgstr "Pas de serveur mandataire"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 msgid "Adjust to Status"
 msgstr "Ajuster selon l’état"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "Allumé"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Éteint"
 
@@ -9465,7 +9448,7 @@ msgstr "Police des lignes de compte"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Votre nouveau compte a été créé avec succès"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9492,47 +9475,50 @@ msgid "_Unregister account from service"
 msgstr ""
 
 #: gajim/gtk/remove_account.py:217
-#, fuzzy
 msgid "Account has to be connected"
-msgstr "Le compte \"%s\" est toujours connecté"
+msgstr "Le compte doit être connecté"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Synchroniser l’historique"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "De combien voulez-vous remonter dans le temps ?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "Un mois"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "Trois mois"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Un an"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "Tout"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s sur %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "%s messages téléchargés"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
@@ -9541,16 +9527,16 @@ msgstr ""
 "Synchronisation de l'historique terminée :\n"
 "%s messages téléchargés"
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr "Gajim est entièrement synchronisé avec l'archive."
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr "Une synchronisation est déjà en cours. Veuillez réessayer plus tard."
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Un client XMPP en GTK+"
@@ -9607,115 +9593,115 @@ msgstr ""
 "Florent Le Coz <louizatakk@fedoraproject.org>\n"
 "ButterflyOfFire <butterflyoffire@protonmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr "Choisissez un fichier à envoyer..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 msgid "Choose Avatar…"
 msgstr "Choisissez un Avatar…"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 msgid "PNG files"
 msgstr "Fichiers PNG"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 msgid "JPEG files"
 msgstr "Fichiers JPEG"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr "Fichier SVG"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Images"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Choisissez une Archive"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 msgid "ZIP files"
 msgstr "Fichier ZIP"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr "Enregistrer le Fichier sous…"
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de ce salon"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Connecté"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Déconnecté⋅e"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
 msgstr "Nom du fichier :"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
 msgstr "Téléchargement"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 msgid "?Noun:Upload"
 msgstr "Envoi"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Transfert de fichier interrompu"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:En pause"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:En pause"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Description : "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:En pause"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:En pause"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:En pause"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:En pause"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:En pause"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:En pause"
@@ -9724,7 +9710,7 @@ msgstr "?transfer status:En pause"
 msgid " (optional)..."
 msgstr " (facultatif) ..."
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 msgid "Invalid Address"
 msgstr "Adresse non valide"
 
@@ -9777,23 +9763,23 @@ msgstr "Message d'un salon mis en surbrillance"
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 msgid "Required"
 msgstr "Requis"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Oui"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "Non"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Annuler"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -9811,10 +9797,6 @@ msgstr "du compte %s"
 msgid "Hide _Contact List"
 msgstr "Inviter des _Contacts"
 
-#: gajim/gtk/statusicon.py:270
-msgid "Show _Contact List"
-msgstr "Affiche_r la liste des contacts"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
@@ -9859,34 +9841,30 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Sauvegarde des préférences pour %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Éditer les préférences d'archivage"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "Vos préférences d'archivage ont été sauvegardées !"
 
-#: gajim/gtk/mam_preferences.py:101
-msgid "No response from the Server"
-msgstr "Aucune réponse du serveur"
-
-#: gajim/gtk/mam_preferences.py:103
-msgid "Error received: {}"
-msgstr "Erreur reçus : {}"
-
-#: gajim/gtk/mam_preferences.py:105
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
 msgid "Archiving Preferences Error"
 msgstr "Éditer les préférences d'archivage"
 
+#: gajim/gtk/mam_preferences.py:108
+msgid "Error received: {}"
+msgstr "Erreur reçus : {}"
+
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Activé"
@@ -9935,32 +9913,32 @@ msgstr "Aucune"
 msgid "?password:Hidden"
 msgstr "Mot de passe :"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
-msgstr ""
+msgstr "Support"
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
-msgstr ""
+msgstr "Sécurité"
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
-msgstr ""
+msgstr "Votre avis"
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
-msgstr ""
+msgstr "Abus"
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
-msgstr ""
+msgstr "Ventes"
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s jours, %(hours)s heures"
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 msgid ""
 "\n"
 "Disabled in preferences"
@@ -9968,15 +9946,15 @@ msgstr ""
 "\n"
 "Désactivé dans les préférences"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Audio / Vidéo"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Active les conversations audio et vidéo dans Gajim"
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
@@ -9984,12 +9962,12 @@ msgstr ""
 "Nécessite : gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
 msgstr "Fonctionnalité indisponible sous Windows"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
@@ -9997,19 +9975,19 @@ msgstr ""
 "Autorise Gajim à mesurer le temps d’inactivité, afin de définir un statut "
 "automatique."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr "Nécessite : libxss"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr "Pas d'exigences additionnelles"
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf (Discussion sans serveur)"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
@@ -10017,56 +9995,56 @@ msgstr ""
 "Autorise Gajim à détecter automatiquement les logiciels du réseau local pour "
 "les discussions sans serveur."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Nécessite : gir1.2-avahi-0.6"
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Nécessite : pybonjour et le SDK de bonjour lancé (%(url)s)."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Paramètres de connexion"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Nécessite : Gspell"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Fonctionnalité indisponible sous Windows"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Notifications"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Active les conversations audio et vidéo dans Gajim"
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Nécessite : python-dbus"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 msgid "Secure Password Storage"
 msgstr "Stockage de mots de passe sécurisé"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
@@ -10074,48 +10052,46 @@ msgstr ""
 "Autorise Gajim à stocker les mots de passe de façon sécurisée et non pas "
 "seulement en texte."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
-"Nécessite : libsecret et un fournisseur (comme GNOME Keyring ou "
-"KSecretService)"
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Nécessite gnome-network-manager"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 "Le coffre fort de Windows est utilisé pour le stockage sécurisé des mots de "
 "passe"
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Vérificateur d'orthographe"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 "Autorise Gajim à vérifier l'orthographe de vos messages pendant la saisie"
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr "Nécessite : Gspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr "Redirection de port UPnP-IGD"
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 "Autorise Gajim à demander à votre routeur de transférer les ports pour les "
 "transferts de fichiers"
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Nécessite : gir1.2-gupnpigd-1.0"
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Éditer les préférences d'archivage"
@@ -10162,7 +10138,7 @@ msgstr "Nom de liste invalide"
 msgid "You must enter a name to create a privacy list."
 msgstr "Vous devez entrer un nom pour créer une liste privée."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Inviter des contacts"
@@ -10190,7 +10166,7 @@ msgstr "Finir"
 msgid "Commands"
 msgstr "Commandes"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr "Suivant"
 
@@ -10254,118 +10230,130 @@ msgstr "Requête d’inscription de la part de %s"
 msgid "Loading"
 msgstr "Chargement"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "_Connecter"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
-msgstr ""
+msgstr "Se connecter"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Suppression du compte..."
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Cliquez pour changer le mot de passe du compte"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexion..."
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Votre serveur ne supporte pas les Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Les espaces ne sont pas autorisés"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Votre serveur ne supporte pas les Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
-#, fuzzy
+#: gajim/gtk/account_wizard.py:454
 msgid "Account is being created"
-msgstr "Le compte \"%s\" est toujours connecté"
+msgstr "Le compte est en train d'être créé"
+
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Rédiger un article"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "La ressource doit comprendre entre 1 et 1023 octets"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Paramètres"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Avertissement"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Erreur SSL inconnue '%s'"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Supprimer le compte"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
-msgstr ""
+msgstr "Redirection"
 
-#: gajim/gtk/account_wizard.py:823
-#, fuzzy
+#: gajim/gtk/account_wizard.py:895
 msgid "Register on the Website"
-msgstr "S'enregistrer à %s"
+msgstr "S'enregistrer sur le site web"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Police des lignes de compte"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Comptes"
@@ -10404,226 +10392,231 @@ msgstr "Résultat de la recherche"
 msgid "No results found"
 msgstr "Aucun résultat trouvé"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Par défaut"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Identifiant"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 msgid "Re-Login now?"
 msgstr "Se reconnecter maintenant ?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Si vous voulez que vos changements soit appliqués immédiatement, vous devez "
 "vous reconnecter."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
-msgstr ""
+msgstr "Plus _tard"
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 #, fuzzy
 msgid "_Re-Login"
 msgstr "Identifiant"
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 msgid "Please check if Bonjour is installed."
 msgstr "Veuillez vérifier si Bonjour est installé."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 msgid "Please check if Avahi is installed."
 msgstr "Veuillez vérifier si Avahi est installé."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 msgid "Disable Account"
 msgstr "Désactiver le compte"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, python-format
 msgid "Account %s is still connected"
 msgstr "Le compte \"%s\" est toujours connecté"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Toutes les fenêtres de conversation et des salons de discussion seront "
 "fermées."
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 msgid "_Disable Account"
 msgstr "_Désactiver le compte"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr "Étiquette"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr "Identifiant"
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "Importer des contacts"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-msgid "Client Certificate"
-msgstr "Certificat client"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 msgid "Connect on startup"
 msgstr "Se connecter au démarrage"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 msgid "Save conversations for all contacts"
 msgstr "Garder l'historique des conversations pour tous les contacts"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr "Enregistrer les conversations sur le disque dur"
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 msgid "Global Status"
 msgstr "Statut Global"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 msgid "Synchronise the status of all accounts"
 msgstr "Synchroniser le statut de tous les comptes"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Utiliser les serveurs mandataires pour les transferts de fichiers"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 msgid "Idle Time"
 msgstr "Durée d’inactivité"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr "Divulguer l’heure de votre dernière activité"
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr "Heure locale du système"
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 "Divulguer l’heure locale du système du périphérique sur lequel tourne Gajim"
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 msgid "Client / Operating System"
 msgstr "Client / Système d’exploitation"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
+#, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Divulguer des informations à propos du client et du système d’exploitation "
 "que vous utilisez actuellement"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 msgid "Ignore Unknown Contacts"
 msgstr "Ignorer les contacts inconnus"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr "Fixer le nom du serveur manuellement"
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr "Priorité"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 msgid "Use environment variable"
 msgstr "Utiliser la variable d'environnement"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 msgid "Synchronize the status of all accounts"
 msgstr "Synchroniser l'état de tous les comptes"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 msgid "First Name"
 msgstr "Prénom"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 msgid "Last Name"
 msgstr "Nom"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 msgid "Email"
 msgstr "Courrier électronique"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 msgid "Adjust to status"
 msgstr "Ajuster selon l'état"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Activer"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 msgid "Port"
 msgstr "Port"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 msgid "Connection Settings"
 msgstr "Paramètres de connexion"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+msgid "Client Certificate"
+msgstr "Certificat client"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "Fichier PKCS12"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 msgid "Encrypted Certificate"
 msgstr "Certificat chiffré"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 msgid "Certificate Settings"
 msgstr "Configuration du certificat"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 msgid "Save Password"
 msgstr "Enregistrer le mot de passe"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 msgid "Login Settings"
 msgstr "Paramètres de connexion"
 
@@ -10676,19 +10669,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d contact supprimé"
 msgstr[1] "%d contacts supprimés"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Artiste Inconnu"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Titre Iconnu"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Source Inconnue"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10702,20 +10695,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Marques-pages pour %s"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Archive corrompue"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "L'archive est vide"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "L'archive est mal-formée"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Le plugin existe déjà"
@@ -10765,13 +10758,13 @@ msgstr "discussion;messagerie;messagerie instantanée;xmpp;bonjour;voip;"
 #: data/org.gajim.Gajim.desktop.in:11 data/org.gajim.Gajim.desktop.in:23
 #: data/org.gajim.Gajim.desktop.in:29
 msgid "org.gajim.Gajim"
-msgstr ""
+msgstr "org.gajim.Gajim"
 
 #: data/org.gajim.Gajim.desktop.in:27
 msgid "Show next pending event"
 msgstr "Montrer le prochain événement en attente"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
@@ -10782,7 +10775,7 @@ msgstr ""
 "discuter à travers divers services XMPP (comme jabber.org) mais aussi avec "
 "des passerelles (comme Facebook, IRC)."
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
@@ -10790,7 +10783,7 @@ msgstr ""
 "Discutez avec vos amis ou votre famille, partagez facilement des photos et "
 "des pensées, ou discutez des nouvelles avec vos groupes."
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
@@ -10798,55 +10791,55 @@ msgstr ""
 "Gajim s'intègre bien avec vos autres appareils : commencez à discutez et "
 "voyez ce qui a été dit sur votre appareil mobile."
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 msgid "Features:"
 msgstr "Fonctionnalités :"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 "Ne ratez jamais un message, gardez tous vous clients de messagerie "
 "synchronisés"
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr "Inviter des amis dans un salon de discussion ou en rejoindre un"
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 "Envoyez facilement des photos, vidéos ou autres fichiers à des amis et des "
 "groupes"
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 #, fuzzy
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 "Discutez de manière sécurisée avec un chiffrement de bout en bout au moyen "
 "de OMEMO ou PGP"
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr "Utilisez vos émoticônes préférées, configurez votre photo de profil"
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr "Sauvegardez et gérez votre historique de conversation"
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr "Organisez vos discussions avec des onglets"
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr "Vérification orthographique automatique des messages composés"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 "Connectez-vous à d'autres messageries avec des passerelles (Facebook, IRC, …)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
@@ -10854,61 +10847,211 @@ msgstr ""
 "Consultez Wikipédia, des dictionnaires ou utilisez des moteurs de recherche "
 "directement depuis la fenêtre de discussion"
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 "Configurez votre activité, musique et humeur pour montrer à vos amis comment "
 "vous vous sentez"
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr "Support pour plusieurs comptes"
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr "Grouper plusieurs contacts d'un même ami en un seul Meta-Contact"
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr "Console XML pour voir ce qui se passe sur la couche protocole"
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 #, fuzzy
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr "Messagerie sans serveur (bonjour / zeroconf), BOSH"
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
 msgstr ""
 "Support pour la découverte des services incluant les nœuds et la recherche "
 "d'utilisateurs"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr "Encore plus de fonctionnalités avec des greffons"
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Liste de contacts"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr "Fenêtre de discussion avec onglets"
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 msgid "Group chat support"
 msgstr "Support des salons de discussion"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Chat history"
 msgstr "Historique des discussions"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 msgid "Plugin manager"
 msgstr "Gestionnaire de plugins"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Démarrer une nouvelle conversation"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "Simule une perte de connexion"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "Simule le rétablissement de la connexion"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Erreur SSL inconnue : %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "Nécessite : libsecret et un fournisseur (comme GNOME Keyring ou "
+#~ "KSecretService)"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr ""
+#~ "Choisissez l'intervalle en secondes entre deux vérifications de "
+#~ "l'inactivité."
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Dictionnaire pour la langue \"%s\" indisponible"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Vous devez installer le dictionnaire \"%s\" pour la vérification "
+#~ "orthographique, ou choisir un autre langage en paramétrant l'option "
+#~ "speller_language.\n"
+#~ "\n"
+#~ "Le soulignement des fautes d'orthographe ne sera pas utilisé"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Reconnecter"
+
+#~ msgid "Quit"
+#~ msgstr "Quitter"
+
+#~ msgid "Show Contact List"
+#~ msgstr "Afficher la liste des contacts"
+
+#~ msgid "Add to Contact List"
+#~ msgstr "Ajouter à la liste de contacts"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Inviter des contacts"
+
+#~ msgid "Configure Group Chat"
+#~ msgstr "Configure le Groupe de Discussion"
+
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Détruire le salon de discussion"
+
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Si activé, Gajim affichera une icône dans chaque onglet contenant des "
+#~ "messages non lus. En fonction du thème, cette icône peut être animée."
+
+#, fuzzy
+#~ msgid "Show a mini avatar in chat window tabs and as the window's icon."
+#~ msgstr ""
+#~ "Montre un avatar miniature dans l'onglet de la fenêtre de discussion et "
+#~ "dans l'icône de la fenêtre"
+
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "Montrer l'avatar dans les onglets de la fenêtre de discussion"
+
+#~ msgid "If checked, the contact's avatar will be shown in chat tabs"
+#~ msgstr ""
+#~ "Si vérifié, l'avatar du contact sera montré dans les onglets de "
+#~ "discussions"
+
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Le serveur doit comprendre entre 1 et 1023 octets"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Caractère non valide dans le nom d'hôte."
+
+#~ msgid "Server address required."
+#~ msgstr "Adresse du serveur requise."
+
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Le nom d'utilisateur doit comprendre entre 1 et 1023 octets"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Caractère non valide dans le nom d'utilisateur."
+
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "La ressource doit comprendre entre 1 et 1023 octets"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Caractère non valide dans la ressource."
+
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Couleur des notifications lorsqu'un contact se connecte."
+
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Couleur des notifications lorsqu'un contact se déconnecte."
+
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Couleur des notifications de nouveau message."
+
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "Couleur des notifications de requête de transfert de fichier."
+
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "Couleur des notifications d'erreur de transfert de fichier."
+
+#~ msgid "Notification color for stopped or completed file transfers."
+#~ msgstr ""
+#~ "Couleur des notifications lorsqu'un transfert de fichier s'arrête ou "
+#~ "finit."
+
+#~ msgid "Notification color for group chat invitations."
+#~ msgstr ""
+#~ "Couleur des notifications d'invitation pour les salons de discussion"
+
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Couleur des notifications lors d'un changement d'état."
+
+#~ msgid "Notification color for other dialogs."
+#~ msgstr "Couleur des notifications pour les autres événements."
+
+#~ msgid "Event Type"
+#~ msgstr "Type d'événement"
+
+#~ msgid "Event desc"
+#~ msgstr "Événement"
+
+#, fuzzy
+#~ msgid "HTTP File Upload: Enable HTTPS Verification."
+#~ msgstr "Envoie par HTTP : Activer la vérification HTTPS"
+
+#~ msgid "No response from the Server"
+#~ msgstr "Aucune réponse du serveur"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Conflit de ressource"
 
@@ -11580,9 +11723,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Envoyer un message privé"
 
-#~ msgid "Send _File"
-#~ msgstr "Envoyer un _fichier"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Participants"
@@ -14211,9 +14351,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Autodetection of network status."
 #~ msgstr "Auto-détection du statut de la connexion."
 
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Nécessite gnome-network-manager"
-
 #~ msgid "Feature not available, see Help->Features"
 #~ msgstr "Fonctionnalité indisponible, voir Aide->Fonctionnalités"
 
@@ -14555,9 +14692,6 @@ msgstr "Gestionnaire de plugins"
 #~ "Vous devriez considérer modifier les paramètres de votre pare-feu si vous "
 #~ "en avez un."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Regrouper les comptes"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
diff --git a/po/gl.po b/po/gl.po
index e9883eb25..9edfbbe5a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:51+0200\n"
 "Last-Translator: Iván Méndez López <>\n"
 "Language-Team:  <softwarelibre@udc.es>\n"
@@ -21,77 +21,83 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Contas"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Elixir unha imaxe"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Non me preguntar outra vez"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Listaxe de privacidade"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "A expulsar %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -164,502 +170,497 @@ msgstr ""
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Enviar mensaxe"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Executar o _comando..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "Renomear"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Gardar o ficheiro como..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Gardar o ficheiro como..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Último estado: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Contactos"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Engadir un contacto..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Charla privada"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Información"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Historial"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "A compor"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Todos os estados"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Contactos"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Novo grupo de charla"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Novo grupo de charla"
+msgid "Rename…"
+msgstr "Renomear"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Cambiar o _tema"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Novo grupo de charla"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Elixir unha imaxe"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Novo grupo de charla"
+msgid "Configure…"
+msgstr "_Continuar"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Descrición: %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Fallou a conexión"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Mensaxes predefinidas:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Cambiar o _alcume"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "Executar o _comando..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "hai %i días"
 msgstr[1] "hai %i días"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "A compor"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Todos os estados"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Engadir un contacto..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "ficheiro"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Enviar mensaxe"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Descubrir os servizos"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferencias"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Listaxe de expulsión"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Engadir esta sala aos marcadores"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Configuración da sala"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Administrar"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Enviar a mensaxe do servidor"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Definir a MDD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Actualizar a MDD"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Eliminar MDD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Engadir un contacto..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Modificar conta"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Modificar conta"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Contas"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Copiar o enderezo"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Entrar nunha sala de charlas"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Engadir un contacto..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copiar o enderezo da ligazón"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Abrir a ligazón no navegador"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copiar o enderezo"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Abrir o editor de correo"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copiar o enderezo da ligazón"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Modificar a conta"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Copiar o enderezo"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Con_vidar"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Expulsar"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Deshabilitar"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Propietario"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Administrar"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Membro"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Membro"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Sala:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "mensaxe"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Emoticonas:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "Enderezo de AIM:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -667,28 +668,28 @@ msgstr "Data"
 msgid "Nickname"
 msgstr "Alcume"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensaxe"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Asunto"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "a crear a base de datos de rexistros"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -701,287 +702,292 @@ msgstr ""
 "\n"
 "Caso de elixir SI, por favor, agarde..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Limpar"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Vostede"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dixo: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Eliminar"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Información"
 msgstr[1] "Información"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 msgstr[1] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Mensaxes de estado por defecto"
 msgstr[1] "Mensaxes de estado por defecto"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 msgstr[1] "Está seguro de que quere eliminar as mensaxes que seleccionou?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contacto : <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Xeral"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "No grupo"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir a MDD"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ningún"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensaxe de estado"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Mensaxe de estado"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Gardar como predefinido..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Ten "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Estado"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Enviar ficheiro"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Gardar o ficheiro como..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Transferencias"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "O ficheiro non é válido"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "A expulsar %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Listaxe de expulsión"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Non existe o grupo de charla."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "A súa información, para se gardar no servidor"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Grupos de charla"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Grupos de charla"
@@ -996,7 +1002,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Erro de Avahi"
@@ -1025,22 +1031,22 @@ msgstr "A súa conta nova creouse con éxito"
 msgid "Failed to Configure Group Chat"
 msgstr "Novo grupo de charla"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s coñéceselle como %s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Coñéceselle como %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s está agora %(status)s"
@@ -1165,81 +1171,81 @@ msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Se pecha esta fiestra, desconectaráselle deste grupo de charla."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Enviar e pechar"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Mensaxe nova"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Enviar e pechar"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1248,191 +1254,182 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Transferencias"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceptar"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "D_esconectado"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Abrir un cartafol de contido"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro ao ler o ficheiro:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Cancelouse a transferencia do ficheiro"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Non se puido estabelecer a conexión co cliente."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar a icona na á_rea de notificación"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Amosar só na _listaxe de contactos"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor avanzado de configuración"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuración da sala"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Amosar todos os _eventos pendentes"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Iniciar a charla"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Grupos de charla"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Enviouse a autorización"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Se \"%s\" acepta esta solicitude, poderá saber o seu estado."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Eliminouse a autorización"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
@@ -1442,7 +1439,7 @@ msgstr "Agora \"%s\" sempre o/a verá desconectado."
 msgid "desynced"
 msgstr "Avanzado"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1462,7 +1459,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Saír"
@@ -1611,8 +1609,8 @@ msgstr "Renomear o grupo"
 msgid "Please enter a new name"
 msgstr "Crear unha publicación nova"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Re_nomear"
@@ -1631,27 +1629,32 @@ msgstr "Quere eliminar o grupo %s da listaxe?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Eliminar da listaxe tamén todos os contactos dentro do grupo"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Novo grupo de charla"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Quere eliminar o grupo %s da listaxe?"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1661,22 +1664,22 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Quero que este contacto coñeza o meu estado despois da eliminación"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1688,24 +1691,24 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1714,12 +1717,12 @@ msgstr ""
 "O seu servidor non admite almacenar información de metacontactos. Por tanto, "
 "toda a información referente non se gardará na próxima reconexión."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1730,126 +1733,126 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Inactivo"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "%s quere enviarlle un ficheiro:"
 msgstr[1] "%s quere enviarlle un ficheiro:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Enviar"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Facer %s e %s metacontactos"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Facer %s e %s metacontactos"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vidar"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar os grupos"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "Contacto desconectado"
+msgid "Execute command"
+msgstr "Executar o _comando..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historial"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historial"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1979,221 +1982,221 @@ msgstr "Charlas privadas"
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Acepta esta solicitude?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Enviouse a autorización"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Enviouse a autorización"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ningún"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Solicitude de subscrición"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Está expulsado deste grupo de charla."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Erro ao ler o ficheiro:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferencias"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Conexión"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2201,20 +2204,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Conectando"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2415,11 +2418,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Fallou a publicación da vCard"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2755,78 +2758,73 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é un directorio mais podería ser un ficheiro"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Descrición: %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Mensaxe privada nova"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Mensaxe nova de %(nickname)s"
 msgstr[1] "Mensaxe nova de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Novo grupo de charla"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambiou o seu estado"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectouse"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectouse"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Fallou a autenticación con \"%s\""
@@ -2890,68 +2888,26 @@ msgid ""
 "not shown."
 msgstr ""
 
-#: gajim/common/config.py:93
-#, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Notificar cando un contacto: "
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Notificar cando un contacto: "
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "_Mostrar o evento na listaxe de contactos"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Notificarme cando rematar unha transferencia"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Notificarme cando rematar unha transferencia"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Cor de fondo para os contactos que acaban de se conectar."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
 # duda sobre collapsed
-#: gajim/common/config.py:102
+#: gajim/common/config.py:93
 #, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Idioma que emprega o corrector"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2961,15 +2917,15 @@ msgstr ""
 "'ás veces' - amosar a hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca amosar a hora."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2978,7 +2934,7 @@ msgstr ""
 "Se é verdadeiro, non elimina */_ . Daquela, *abc* será negra, mais sen "
 "eliminar * *"
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2987,7 +2943,7 @@ msgstr ""
 "Carácter para engadir despois do alcume cando se usa o completado de alcume "
 "(tab) nos grupos de charla."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2996,17 +2952,17 @@ msgstr ""
 "Carácter para propor para engadir logo do alcume desexado cando alguén está "
 "a empregalo no grupo de conversa."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -3014,22 +2970,22 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3038,30 +2994,30 @@ msgstr ""
 "Cantas liñas quere lembrar da última charla cando se volve abrir un "
 "separador/fiestra de charla"
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Envíe un mensaxe con Ctrl+Intro e con Intro faise unha liña nova (como o "
 "cliente de Mirabilis ICQ)"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Cantas liñas desexa almacenar para Ctrl+Arriba."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3070,12 +3026,12 @@ msgstr ""
 "URL personalizada con %s onde %s é a palabra/frase ou 'WIKTIONARY' que "
 "significa usar o wiktionary"
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se está marcado, o Gajim pode controlarse remotamente ao usar o gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3084,21 +3040,21 @@ msgstr ""
 "Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
 "cada x minutos."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3107,34 +3063,34 @@ msgstr ""
 "Elimínase o host que enviamos para a transferencia dun ficheiro caso de "
 "tradución do enderezo ou o redirección de portos."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Segundo o estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifica acontecementos na área de notificación."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Quere amosar o separador cando só hai unha conversa?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 "Quere amosar o bordo a pestanexar do caderno de notas nas fiestras charla?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3143,7 +3099,7 @@ msgstr ""
 "Separarase por ';'unha listaxe de palabras que serán resaltadas nos grupos "
 "de charla."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3154,22 +3110,13 @@ msgstr ""
 "fiestras. Esta preferencia só se activa se se usa a icona da área de "
 "notificación. "
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Se for verdadeiro, o Gajim amosará unha icona en cada separador que conteña "
-"mensaxes sen ler. A depender do tema, esta icona pode ser animada."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3178,12 +3125,12 @@ msgstr ""
 "Se é verdadeiro, o Gajim amosará a mensaxe de estado, se non está baleiro, "
 "para cada contacto baixo o seu nome de contacto na fiestra da listaxe."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3192,26 +3139,26 @@ msgstr ""
 "Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
 "cambie o seu estado ou a súa mensaxe de estado"
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Non amosar a listaxe na barra de tarefas."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3220,7 +3167,7 @@ msgstr ""
 "Se é verdadeiro e as versións instaladas de GTK+ e PyGTK son, cando menos, "
 "2.8, resalta a fiestra cando hai eventos pendentes."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3241,7 +3188,7 @@ msgstr ""
 "envíase a unha fiestra específica. Nota: cambie esta opción require "
 "reiniciar o Gajim para que os cambios teñan efecto."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3249,33 +3196,33 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Se é verdadeiro, ao premer a tecla escape pecha unha fiestra/separador."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Oculta o báner nunha fiestra de grupo de charla"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Oculta o báner nunha fiestra de grupo de charla"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Oculta os ocupantes nas fiestras de grupo de charla."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3284,12 +3231,12 @@ msgstr ""
 "Nunha charla, amosa o alcume ao comezo nunha soa liña cando non é a mesma "
 "persoa a que enviou a última mensaxe."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3298,7 +3245,7 @@ msgstr ""
 "Ctrl-Tab conduce ao próximo separador de composición cando ningún está sen "
 "ler."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3307,7 +3254,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3316,7 +3263,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3327,154 +3274,146 @@ msgstr ""
 "fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
 "prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3483,7 +3422,7 @@ msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3492,28 +3431,32 @@ msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Engadir esta sala aos marcadores"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3522,62 +3465,62 @@ msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3586,33 +3529,33 @@ msgstr ""
 "Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
 "opción file_transfer_proxies para a súa transferencia."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3621,28 +3564,24 @@ msgstr ""
 "Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
 "opción file_transfer_proxies para a súa transferencia."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Engadir unha notificación especial para %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3651,41 +3590,41 @@ msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3694,91 +3633,91 @@ msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "A comer"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Estou a traballar."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "A traballar"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Teléfono"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Fóra"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3788,1127 +3727,1127 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "A"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: non se pode abrir %s para lectura"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Ningún"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Grupos de charla"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Convite a grupo de charla"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Convite a grupo de charla"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Grupos de charla"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Grupos de charla"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Ningún"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "A creación de grupos de charla está restrinxida."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Novo grupo de charla"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "O servizo non se achou"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Isto non é un grupo de charla"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "A conta local xa existe."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Non existe o grupo de charla."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Grupos de charla"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host errado"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cleaning"
 msgstr "Serán"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cooking"
 msgstr "A compor"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Gardening"
 msgstr "Mañá"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "todos no grupo"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "A traballar"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 #, fuzzy
 msgid "Dancing"
 msgstr "Serán"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "A expulsar %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entrar"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 #, fuzzy
 msgid "Skiing"
 msgstr "A traballar"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "A traballar"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Shaving"
 msgstr "A comer"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cambiando o asunto"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Hiding"
 msgstr "A expulsar %s"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Praying"
 msgstr "A comer"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Thinking"
 msgstr "A traballar"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Fishing"
 msgstr "A expulsar %s"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 #, fuzzy
 msgid "Gaming"
 msgstr "A comer"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "_Desconectar"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Partying"
 msgstr "A comer"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "Motivo"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Motivo"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 #, fuzzy
 msgid "Shopping"
 msgstr "A durmir"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 #, fuzzy
 msgid "Smoking"
 msgstr "A traballar"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sunbathing"
 msgstr "A comer"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Estou a ver un filme."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "A comer"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 #, fuzzy
 msgid "On the Phone"
 msgstr "Estou a falar por teléfono."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Traveling"
 msgstr "A transferir"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Commuting"
 msgstr "A compor"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "On a Train"
 msgstr "_Abrir como ligazón"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Walking"
 msgstr "A traballar"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 #, fuzzy
 msgid "Coding"
 msgstr "A compor"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "A traballar"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausado"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Bored"
 msgstr "Negra"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 #, fuzzy
 msgid "Brave"
 msgstr "Ten "
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 #, fuzzy
 msgid "Cautious"
 msgstr "Charlas"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Cold"
 msgstr "Negra"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 #, fuzzy
 msgid "Confident"
 msgstr "_Contidos"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completado"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Contented"
 msgstr "_Contidos"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 #, fuzzy
 msgid "Creative"
 msgstr "Inactivo"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 #, fuzzy
 msgid "Dejected"
 msgstr "Eliminar"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "Disappointed"
 msgstr "Desactivado"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "Dismayed"
 msgstr "Desactivado"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "Distracted"
 msgstr "Desactivado"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "mensaxe"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisíbel"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Lonely"
 msgstr "unha"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "Mean"
 msgstr "Alemán"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "Offended"
 msgstr "Desconectado"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "once"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 #, fuzzy
 msgid "Sad"
 msgstr "Atascado"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 #, fuzzy
 msgid "Satisfied"
 msgstr "Última modificación:"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Sick"
 msgstr "Alcume"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Sleepy"
 msgstr "A durmir"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Stressed"
 msgstr "Rúa:"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Surprised"
 msgstr "Engadiuse"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 #, fuzzy
 msgid "Tired"
 msgstr "Hora"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 #, fuzzy
 msgid "Undefined"
 msgstr "nove"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "Por defecto"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "mariño"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "A expulsar %s"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "País:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Conta"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Descrición"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Erro de Avahi"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "unha"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Configuración da sala"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "É necesario o contrasinal"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorización aceptada"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Cifrado desactivado"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "É necesario o contrasinal"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Cifrado activado"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Extensión non admitida"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Fallou a autenticación con \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4970,12 +4909,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración da sala"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4987,294 +4926,253 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Carácter non válido no nome do host."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "É necesario o enderezo do servidor."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Hai un caracter non válido no nome de usuario."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Carácter non válido no recurso."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Pausada"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Desconectado"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Propietario"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Propietario"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrador"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está a escribir..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar a mensaxe"
 msgstr[1] "Enviar a mensaxe"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "Entrar nun grupo de charla"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é un ficheiro mais podería ser un directorio"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim pecharase agora"
 
@@ -5378,91 +5276,91 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "Camiño do ficheiro"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 #, fuzzy
 msgid "File does not exist"
 msgstr "Non existe o grupo de charla."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Cifrado desactivado"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 #, fuzzy
 msgid "Change status information"
 msgstr "Información"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 #, fuzzy
 msgid "Change status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre para falar"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 #, fuzzy
 msgid "Online"
 msgstr "nove"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Non molestar."
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrición do erro..."
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contactos"
@@ -5487,7 +5385,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Conta"
 
@@ -5498,7 +5396,7 @@ msgstr "Grupos de charla"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Contrasinal: "
@@ -5522,7 +5420,7 @@ msgstr "Entrar nun grupo de charla"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Entrar"
@@ -5540,17 +5438,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -5699,7 +5597,7 @@ msgstr "Información"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Descrición"
 
@@ -5907,39 +5805,44 @@ msgstr "Traballo"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Acerca de"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Entrar nunha sala de charlas"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Volvo axiña"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Entrar"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "A eliminar a conta %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -6012,6 +5915,7 @@ msgid "Strike"
 msgstr "Alcume"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr ""
 
@@ -6025,135 +5929,130 @@ msgstr "_Letra:"
 msgid "Clear formatting"
 msgstr "Información"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Elixa un ficheiro para enviar..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "A expulsar..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Despois do alcume:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Cambiar o _alcume"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Cambiar o _tema"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Insira o contrasinal novo:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Novo grupo de charla"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Produciuse un erro:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Participante"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Participante"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Deshabilitar"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Novo grupo de charla"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Descrición: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Motivo"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Con_vidar"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Acontecemento"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Eventos"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6252,20 +6151,20 @@ msgid "Add"
 msgstr "Enderezo"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Eliminar"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Recurso:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Estado"
 
@@ -6275,7 +6174,7 @@ msgid "Client"
 msgstr "Cliente:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Personalizado</b>"
@@ -6417,38 +6316,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Amosar _listaxe"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Combinar as contas"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6457,12 +6357,12 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6471,54 +6371,54 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as mensaxes de estado dos contactos "
 "debaixo do nome do contacto na listaxe e en grupos de charla"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar os contacto_s polo estado"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Contactos"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entrar nun grupo de charla"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Contacto desconectado"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6526,29 +6426,29 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "contido da mensaxe"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6557,125 +6457,126 @@ msgstr ""
 "Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
 "cambie o seu estado ou a súa mensaxe de estado"
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Fallou a conexión"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Último estado: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Charla"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Usar a icona na á_rea de notificación"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Cando se reciba un acontecemento novo"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
 "ocupado ou invisíbel."
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
 "ocupado ou invisíbel."
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar cando un contacto: "
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6684,63 +6585,63 @@ msgstr ""
 "O Gajim notificaralle novos acontecementos a través dunha mensaxe emerxente "
 "no bordo inferior dereito da pantalla"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cando un contacto: "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Notificacións visuais</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Reproducir _sons"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Xestio_nar..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Sons Wav"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificar a conta"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Non dispoñíbel"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6748,7 +6649,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6756,109 +6657,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutos"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "_Adaptar ao estado"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Preguntar a mensaxe de estado cando estea: "
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensaxes de estado por defecto"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Mensaxe de estado"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Configurar as cores e as fontes da interface"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Conxunto de _iconas de estado por defecto:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "_Usar as iconas do transporte"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6868,119 +6769,129 @@ msgstr ""
 "(por exemplo, un contacto de MSN terá a icona de MSN equivalente para o seu "
 "estado en liña, ausente, ocupado etc.)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 #, fuzzy
 msgid "Style"
 msgstr "Atascado"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Características dos servidores"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Mensaxes de estado por defecto"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Charla privada"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Conexión"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Servidor:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Xestionar..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Varios</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Editor avanzado de configuración"
@@ -7171,12 +7082,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Insira o contrasinal novo:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Accións A_vanzadas"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Usa un nome de host e un porto personalizados"
@@ -7263,7 +7174,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Conectar"
@@ -7277,7 +7188,7 @@ msgstr "Crear unha publicación nova"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7306,8 +7217,8 @@ msgstr "_Restabelecer as cores predeterminadas"
 msgid "Resets value to default"
 msgstr "_Restabelecer as cores predeterminadas"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Nome do host:"
@@ -7351,7 +7262,7 @@ msgstr "O nome de usuario non é válido"
 msgid "Proxy Host"
 msgstr "Proxy"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Tipo"
 
@@ -7365,8 +7276,7 @@ msgstr "_Protocolo:"
 msgid "Copy info to clipboard"
 msgstr "_Copiar o enderezo da ligazón"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 #, fuzzy
 msgid "Features"
 msgstr "Características dos servidores"
@@ -7552,6 +7462,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Cambiar a mensaxe de estado"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -7630,8 +7545,8 @@ msgstr "Atascado"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7823,80 +7738,106 @@ msgstr "Fallou a conexión"
 msgid "_Name"
 msgstr "_Nome: "
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Iniciar a charla"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Novo grupo de charla"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Historial"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Fallou a conexión"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Preferencias"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Saír"
+msgid "_Accounts"
+msgstr "Contas"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Ver"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Amosar os contactos desconectados"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Amosar os contactos desconectados"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Amosar os contactos desconectados"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Amosar os trans_portes"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Consola XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Transferencias"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Axuda"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "nove"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "nove"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Características dos servidores"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Acerca de"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7911,6 +7852,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Novo grupo de charla"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8197,60 +8143,68 @@ msgstr "Contacto desconectado"
 msgid "Create new group chat"
 msgstr "Novo grupo de charla"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Transferencias"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "mensaxe de estado"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Amosar a consola de _XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Editar unha regra</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Contactos"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Información"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Renomear o contacto"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Contactos"
@@ -8326,12 +8280,16 @@ msgstr "Cubrir o formulario."
 msgid "Group Chat Configuration"
 msgstr "Convite a grupo de charla"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Consola XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Iniciar a charla"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filtro:"
@@ -8378,11 +8336,6 @@ msgstr "Amosar todos os _eventos pendentes"
 msgid "Mute Sounds"
 msgstr "Sen sons"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Preferencias"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8703,124 +8656,124 @@ msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Ningún"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Grupos de charla"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Ningún"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Grupos de charla"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Ningún"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Este grupo de charla non ten un asunto"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Grupos de charla"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Grupos de charla"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Grupos de charla"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Ningún"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Convite a grupo de charla"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Non está conectado ao servidor"
@@ -8849,7 +8802,7 @@ msgid "Sender: %s"
 msgstr "Remitente: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Destinatario: "
 
@@ -9002,7 +8955,7 @@ msgstr "Ficheiro: "
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Remitente: "
 
@@ -9017,7 +8970,7 @@ msgid "Change"
 msgstr "Cambiar o _alcume"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Volvo axiña"
@@ -9048,11 +9001,12 @@ msgid "Password Change Failed"
 msgstr "É necesario o contrasinal"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Produciuse un erro durante a creación da conta"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
 
@@ -9087,40 +9041,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Conexión"
+msgid "Start / Join Chat"
+msgstr "Iniciar a charla"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Engadir un contacto..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "Non se encontrou %s"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servizo non respondeu aínda con información detallada"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9129,33 +9078,33 @@ msgstr ""
 "Este servizo podería non responder con información detallada.\n"
 "Posibelmente é antigo ou está roto"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Outros"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Grupos de charla"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Sen unha conexión non pode navegar polos servizos dispoñíbeis"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9163,145 +9112,145 @@ msgstr ""
 "Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
 "e ténteo máis tarde."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servizo non contén ningún elemento para navegar."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Navegar"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Buscar"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Escaneando %d / %d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Usuarios"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 #, fuzzy
 msgid "Node"
 msgstr "Ningún"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Publicación nova"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Enviar mensaxe"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "tema"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Mensaxe:"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Alcume non permitido: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
@@ -9348,91 +9297,75 @@ msgstr "Rexistrar %s"
 msgid "Registration failed"
 msgstr "Fallou a conexión"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Non está dispoñíbel o dicionario para o idioma %s"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
-"lingua e logo definir a opción speller_language."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "para a conta %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Número de GG:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Convite a grupo de charla"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
@@ -9447,6 +9380,11 @@ msgstr "Número de GG:"
 msgid "ICQ Number"
 msgstr "Número de ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Engadir un contacto..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9502,7 +9440,7 @@ msgstr "Erro ao engadir o servizo. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9663,31 +9601,51 @@ msgstr "Contacto desconectado"
 msgid "Contact Connected Background "
 msgstr "Nome de contacto"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Mensaxe de estado"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Mensaxe de estado"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Mensaxe de estado"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Mensaxe de estado"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Alcume non permitido: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9696,12 +9654,12 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Activo"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Fallou a conexión"
@@ -9725,10 +9683,9 @@ msgid "Error: %s"
 msgstr "Mensaxe de erro: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr ""
 
@@ -9742,48 +9699,48 @@ msgstr "O estado é agora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Serán"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Xestionar os perfís do proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Adaptar ao estado"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Desconectado"
@@ -9804,7 +9761,7 @@ msgstr "Conta"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "A súa conta nova creouse con éxito"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9836,60 +9793,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Amosar os contactos desconectados"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Que quere facer?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "%d mensaxe sen ler"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Un cliente de Jabber de GTK"
@@ -9947,130 +9909,130 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Elixa un ficheiro para enviar..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Elixir unha imaxe"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Todos os ficheiros"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Todos os ficheiros"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Enviar ficheiro"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Imaxes"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elixir unha imaxe"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Todos os ficheiros"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Gardar o ficheiro como..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s deste grupo de charla"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 #, fuzzy
 msgid "Connected"
 msgstr "Conexión"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto desconectado"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Nome do ficheiro: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Descarga"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Subida"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Detívose a transferencia do ficheiro"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Pausada"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Pausada"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 #, fuzzy
 msgid "Description: "
 msgstr "Descrición: %s"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Pausada"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Pausada"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Pausada"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Pausada"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Pausada"
@@ -10079,7 +10041,7 @@ msgstr "Pausada"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "O ficheiro non é válido"
@@ -10137,26 +10099,26 @@ msgstr "Remarcado da mensaxe de grupo de charla"
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Ningún"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancelar"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10175,11 +10137,6 @@ msgstr "a usar a conta %s"
 msgid "Hide _Contact List"
 msgstr "Contactos"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Amosar os contactos desconectados"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
@@ -10229,36 +10186,31 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Preferencias"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Preferencias"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Non está conectado ao servidor"
+msgid "Archiving Preferences Error"
+msgstr "_Preferencias"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Recibiu unha entrada nova:"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Preferencias"
-
 #: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
@@ -10309,172 +10261,172 @@ msgstr "Ningunha"
 msgid "?password:Hidden"
 msgstr "Contrasinal: "
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Preferencias"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "A mensaxe de estado de non autodispoñíbel"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Conexión"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "_Voz"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "A mensaxe de estado de non autodispoñíbel"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Modificar a conta"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Gardar o contrasinal"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Historial"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Preferencias"
@@ -10520,7 +10472,7 @@ msgstr "O nome de listaxe non é válido"
 msgid "You must enter a name to create a privacy list."
 msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Contactos"
@@ -10548,7 +10500,7 @@ msgstr "_Rematar"
 msgid "Commands"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10620,120 +10572,134 @@ msgstr "Solicitude de subscrición de %s"
 msgid "Loading"
 msgstr "A compor"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Conexión"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Conectar"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "A eliminar a conta %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Prema para cambiar o contrasinal da conta"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Conectando"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "O seu servidor non admite o vCard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Alcume non permitido: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "O seu servidor non admite o vCard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Fallou a conexión"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Engadir un contacto..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Crear unha publicación nova"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Accións A_vanzadas"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "A expulsar %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Configuración da sala"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "A eliminar a conta %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Rexistrar %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Conta"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Contas"
@@ -10776,250 +10742,254 @@ msgstr "Buscar"
 msgid "No results found"
 msgstr "Non se encontrou %s"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Por defecto"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Quere reconectarse agora?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Quere reconectarse agora?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Se quere que se apliquen todos os cambios instantaneamente, debe "
 "reconectarse."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "O nome da conta non é válido"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "O nome da conta non é válido"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Contactos"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onectar ao inicio de Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Gravar as conversas para todos os contactos"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Todos os estados"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Usar proxies para as transferencias de ficheiros"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " desde %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Contactos"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr ""
 "_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Pr_ioridade:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Conexión non dispoñíbel"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Nome:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Apelido(s):"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Correo electrónico novo"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Adaptar ao estado"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Activar"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Porto:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Conexión"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Gardar o contrasinal"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Fallou a conexión"
@@ -11072,19 +11042,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Elimina o contacto da listaxe"
 msgstr[1] "Elimina o contacto da listaxe"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11096,21 +11066,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Engadir esta sala aos marcadores"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Camiño do ficheiro"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11167,127 +11137,232 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Amosar todos os _eventos pendentes"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Características dos servidores"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Xestión de servizos coa conta %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Contactos"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Grupos de charla"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Recentemente:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Fallou a conexión"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Conexión"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Non está dispoñíbel o dicionario para o idioma %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
+#~ "lingua e logo definir a opción speller_language."
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "Contacto desconectado"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Saír"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Amosar os contactos desconectados"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Engadir un contacto..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Contactos"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Novo grupo de charla"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Novo grupo de charla"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Se for verdadeiro, o Gajim amosará unha icona en cada separador que "
+#~ "conteña mensaxes sen ler. A depender do tema, esta icona pode ser animada."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Carácter non válido no nome do host."
+
+#~ msgid "Server address required."
+#~ msgstr "É necesario o enderezo do servidor."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Hai un caracter non válido no nome de usuario."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Carácter non válido no recurso."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Notificar cando un contacto: "
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Notificar cando un contacto: "
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "_Mostrar o evento na listaxe de contactos"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Notificarme cando rematar unha transferencia"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Notificarme cando rematar unha transferencia"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Cor de fondo para os contactos que acaban de se conectar."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Acontecemento"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Eventos"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Non está conectado ao servidor"
+
+#, fuzzy
 #~ msgid "Resource Conflict"
 #~ msgstr "Conflito co nome de usuario"
 
@@ -11839,9 +11914,6 @@ msgstr "Fallou a conexión"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Enviar unha mensaxe privada"
 
-#~ msgid "Send _File"
-#~ msgstr "Enviar ficheiro"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Participantes"
@@ -13742,10 +13814,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Atascado"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Fallou a conexión"
-
 #~ msgid "cyan"
 #~ msgstr "ciano"
 
@@ -13886,10 +13954,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Network-Watcher"
 #~ msgstr "Historial"
 
-#, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Historial"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -14175,9 +14239,6 @@ msgstr "Fallou a conexión"
 #~ "seleccionar outro aquí.\n"
 #~ "Podería considerar mudar algúns aspectos da configuración da protección."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Combinar as contas"
-
 #, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP non se pode usar neste ordenador"
diff --git a/po/he.po b/po/he.po
index afd906511..415e4b59e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2014-06-21 16:23+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan@gmx.ca>\n"
 "Language-Team: Rahut\n"
@@ -21,76 +21,82 @@ msgstr ""
 "X-Language: he\n"
 "X-Source-Language: en\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "חשבונות"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "והינה מאומתת"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "ואינה מאומתת"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "הצפנת %(type)s %(status)s מופעלת %(authenticated)s.\n"
 "סשן שיחתך %(logged)s ברשומות ההיסטוריה."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "בחירת תמונה"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "בחרת לסגור מספר כרטיסיות"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "האם אתה בטוח כי ברצונך לעזוב את שיחת קבוצה \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "אל ת_שאל אותי שוב"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "רשימת פרטיות"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "אזהרה: %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את המזהה Jabber שלך במלואו."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "ה_משך"
 
@@ -162,504 +168,500 @@ msgstr "לא קיימת שום בקשת הרשמה ממתינה."
 msgid " resource with priority "
 msgstr " משאב עם עדיפות "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "הצג אנשי קשר _לא מקוונים"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "ברצוני להוסיף אותך לרשימת הקשר שלי."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "שלח הודעה _בודדת..."
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "הרץ _פקודה"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_נהל מוביל"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "ה_תאם מוביל"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_שנה שם"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_בטל חסימה"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_חסום"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "הס_ר"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_מידע"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "שלח _קובץ"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "שמור קובץ בשם..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "שמור קובץ בשם..."
 
 # By last state
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "לפי מצב אחרון"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "הזמן _אנשי קשר"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "הוסף _איש קשר..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "בקשה לשיחה קולית"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "בדיקת וידאו"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_מידע"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_היסטוריה"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "מנוטרלת"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "הלחנה בלבד"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "בכל מצב שיחה"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "הזמן _אנשי קשר"
+msgid "All Chat States"
+msgstr "בכל מצב שיחה"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "עזוב שיחות קבוצה"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "עזוב שיחות קבוצה"
+msgid "Rename…"
+msgstr "_שנה שם"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "שנה _נושא..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "עזוב שיחות קבוצה"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "בחירת ארכיון"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "שיחת קבוצה חדשה"
+msgid "Configure…"
+msgstr "תצורה"
+
+# Destroying is "at this moment".  It should be Destroy without ing
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "החרבת ‫%s"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "קיצורי מקש"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "הצג _הודעות מצב"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "הודעות מותאמות:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_מזער בעת סגירה"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "מ_זער בעת הצטרפות אוטומטית"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "שנה שם _כינוי..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_בקש ביטוי"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "הרץ _פקודה"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "הלחנה בלבד"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "בכל מצב שיחה"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "הוסף _איש קשר..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "cli"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "שלח הודעה _בודדת..."
 
 # איתור
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "מצא _שירותים"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "שרת"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "ערוך העדפות _ארכיונאות"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "רשימת אסירה"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_סמן"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "תצורה"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "סנכרון"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "רשימות פרטיות"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_מנהל"
 
 # בשורה מסר
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_שלח הודעת שרת..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "הגדר MOTD..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "עדכן MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "מחק MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "הוסף _איש קשר..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "ה_תאם חשבון..."
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "ה_תאם חשבון..."
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "ה_עתק כתובת JID/דוא״ל"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "הצטרף לשיחת קבוצה"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "התחלת שיחה"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "הוסף _איש קשר..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "ה_עתק מיקום קישור"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_פתח קישור בתוך דפדפן"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "ה_עתק כתובת JID/דוא״ל"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_פתח מלחין דוא״ל"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "ה_עתק מיקום קישור"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "מיקום: "
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "ה_עתק כתובת JID/דוא״ל"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "ה_זמן"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_בטל חסימה"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_חסום"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "ב_עט"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "א_סור"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "בעלים"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_מנהל"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "חבר"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "חבר"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_בקש ביטוי"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "cli"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "cli"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "cli"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 #, fuzzy
 msgid "Show this help message and exit"
 msgstr "cli"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "אין אפשרות למצוא מסד נתונים של רשומות היסטוריה"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "קובץ לא קיים"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "כתובת AIM:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "תאריך"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -667,28 +669,28 @@ msgstr "תאריך"
 msgid "Nickname"
 msgstr "שם כינוי"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "הודעה"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "נושא"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "ניקוי מסד נתונים"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "כעת יוצר מטמון מסד נתונים"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -701,298 +703,303 @@ msgstr ""
 "\n"
 "במידה ותבחר להקיש כן, אנא המתן..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_נקה"
 
 # Can this be changed to: Me?
 # את/ה
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "עצמך"
 
 # BUG: said > wrote?
 # Needs to be tested
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "‏%(who)s בשעה %(time)s אמר/ה: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "מחק"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "אימות מחיקה"
 msgstr[1] "אימות מחיקה"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "האם אתה בטוח כי ברצונך למחוק את ההודעה הנבחרת?"
 msgstr[1] "האם אתה בטוח כי ברצונך למחוק את ההודעה הנבחרת?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "הודעה שגרתית"
 msgstr[1] "הודעה שגרתית"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "האם אתה בטוח כי ברצונך למחוק את ההודעה הנבחרת?"
 msgstr[1] "האם אתה בטוח כי ברצונך למחוק את ההודעות הנבחרות?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "שם איש קשר: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
 # (קבוצה כללית)
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "כללית"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "קבוצה"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "בקבוצה"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "קביעת מצב רוח"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "ללא"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "‫%s הודעת מצב"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "הודעת מצב"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 #, fuzzy
 msgid "Overwrite"
 msgstr "להחליף?"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "החלף הודעת מצב?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "שם זה כבר מצוי בשימוש. האם ברצונך להחליף את הודעת המצב הקיימת?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "להחליף?"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "הודעת מצב"
 
 # ערוך מראש
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "שמור בתור מצב מותאם..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "אנא הקלד שם עבור הודעת מצב זו"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "נשמר בתוך: ‎%s"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "מצב"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "אינך מחובר לשרת"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "ללא חיבור, אין באפשרותך לסנכרן את אנשי הקשר שלך."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "שם"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "שרת"
 
 # Sync account > Unlogged account > Error
 # Should this be "to its server" OR "to a server"?
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "חשבון זה אינו מחובר כעת לשרת"
 
 # BUG: synchronise with *another* account
 # עד אשר זה לא יחובר
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "אין באפשרותך להסתנכרן עם חשבון אלא אם כן החשבון הינו מחובר."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "סנכרון"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "קול וגם וידאו"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "קול"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "וידאו"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr "‏%(contact)s רוצה להתחיל עמך בסשן %(type)s. האם יש ברצונך לענות לקריאה?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "שלח _קובץ"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "שמור קובץ בשם..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "העברת קובץ נכשלה"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "קובץ שגוי"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "לא היתה אפשרות להטעין תמונה"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "בעיטת ‫%s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "רשימת אסירה"
 
 # להכניס/להזין
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "שבץ שם כינוי"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "בקשה לשיחה קולית"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 #, fuzzy
 msgid "_Approve"
 msgstr "אשר"
 
 # ‏%(jid)s הגדיר/ה את הנושא אל %(subject)s
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "הנושא הוגדר על ידי %(nick)s אל %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "כרגע החדר מציג חברים אשר אינם זמינים"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "כרגע החדר לא מציג חברים אשר אינם זמינים"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "סשן זה יושם בארכיון על שרת"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "מידע אודותייך, כפי שמאוחסן בשרת"
 
 # This room is not anonymous
 # חדר לא אנונימי
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "החדר אינו אנונימי"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "החדר הינו אנונימי למחצה"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "החדר הינו אנונימי לחלוטין"
@@ -1007,7 +1014,7 @@ msgstr "פונג! (%s ש.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "פונג! (%s ש.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "שגיאה."
 
@@ -1040,24 +1047,24 @@ msgid "Failed to Configure Group Chat"
 msgstr "עזוב שיחות קבוצה"
 
 # את/ה ידוע/ה כעת בתור
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "הכינוי החדש שלך הוא %s"
 
 # בכינוי
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s ידוע/ה כעת בתור %(new_nick)s"
 
 # את/ה ידוע/ה כעת בתור
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "הכינוי החדש שלך הוא %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s מצוי/ה כעת במצב %(status)s "
@@ -1186,83 +1193,83 @@ msgstr "האם אתה בטוח כי ברצונך לעזוב את שיחת קבו
 msgid "If you close this window, you will leave '%s'."
 msgstr "כאשר תסגור את חלון זה, אתה תנותק מתוך שיחת קבוצה זו."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
 # in or to?
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s הוזמן/ה לחדר זה"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "הצגת רשימת עיצובים"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "איש קשר זה לא תומך HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "פינג?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "פונג! (%s ש.)"
 
 # This status message is not aligned by Gajim
 # Should a bug be reported?
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "מצב : %(type)s :‏ %(state)s, סיבה: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s מתוך שיחת קבוצה %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "התעלם משגיאה זו עבור תעודה זו."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "זה עתה קיבלת הודעה חדשה מן \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_שלח וסגור"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "הודעה חדשה"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_שלח וסגור"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1271,188 +1278,179 @@ msgstr ""
 "נושא: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s מצוי/ה כעת במצב %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "העברות קבצים"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "גודל"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_קבל"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "לא מ_קוון"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "העברת קובץ הושלמה"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_פתח תיקיה מכילה"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "הזמנת שיחת קבוצה"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "איש קשר מרוחק הפסיק העברה"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "שגיאה בפתיחת קובץ"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "העברת קובץ נעצרה"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "העברת קובץ בוטלה"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "חיבור עם עמית לא היה אפשרי לביסוס."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "הצג סמל אזור התראה:"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "cli"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "cli"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "cli"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "cli"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 #, fuzzy
 msgid "Configure logging system"
 msgstr "cli"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "הצג _אירועים ממתינים"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "cli"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "התחלת שיחה"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "שגיאת מסד נתונים"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "חשבונות ממוזגים"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "מובילים"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "שיחות קבוצה"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "הרשאה נשלחה"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "מעתה המצב שלך יהיה גלוי בפני \"%s\"."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "בקשת הרשמה נשלחה"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "אם בקשתך תתקבל על ידי \"%s\" המצב שלו או שלה יהיה גלוי בפניך."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "הרשאה הוסרה"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "מעתה המצב שלך יראה בתור לא מקוון עבור \"%s\"."
@@ -1463,7 +1461,7 @@ msgid "desynced"
 msgstr "לא מסונכרן"
 
 # In Hebrew: גאג'ים
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "‫Gajim"
@@ -1483,7 +1481,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "סגור את Gajim תמיד"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
@@ -1645,8 +1644,8 @@ msgstr "שינוי שם קבוצה"
 msgid "Please enter a new name"
 msgstr "אנא צור מוטיב חדש עם השם הרצוי עליך."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "_שנה שם"
@@ -1665,27 +1664,32 @@ msgstr "האם ברצונך להסיר את קבוצת %s מתוך הרשימה?
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "הסר גם את כל אנשי הקשר שבקבוצה זו מתוך הרשימה שלי"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "עזוב שיחות קבוצה"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "אנא הקלד שם משתמש חדש עבור חשבונך המקומי"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "cli"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "בחרת להסיר את \"%(name)s\" (%(jid)s) מתוך הרשימה שלך.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1695,22 +1699,22 @@ msgstr ""
 "אתה גם תסיר הרשאה דבר אשר יגרום למצב בו אנשי קשר אלה תמיד יראו אותך במצב לא "
 "מקוון."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "האם ברצונך להמשיך?"
 
 # לאחר כעבור
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "ברצוני כי איש קשר זה יהיה מיודע באשר למצב שלי עובר הסרה"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "cli"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1722,25 +1726,25 @@ msgstr ""
 "אתה גם תסיר הרשאה דבר אשר יגרום למצב בו אנשי קשר אלה תמיד יראו אותך במצב לא "
 "מקוון."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "אין חשבון זמין"
 
 # לפני שתעמוד לרשותך האפשרות לשוחח
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "עליך ליצור חשבון בטרם תהיה באפשרותך לשוחח עם אנשי קשר אחרים."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "אחסון אנשי קשר מוצמדים לא נתמך על ידי השרת שלך"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1748,12 +1752,12 @@ msgstr ""
 "השרת שלך לא תומך באחסון מידע אנשי קשר מוצמדים. לכן מידע זה לא יישמר בהתחברות "
 "הבאה."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "בחרת ליצור איש קשר מוצמד. האם אתה בטוח כי ברצונך להמשיך?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1764,123 +1768,124 @@ msgstr ""
 "כללי זו בשימוש כאשר אותה האישיות מחזיקה במספר חשבונות Jabber או חשבונות "
 "מוביל."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "יצירתי"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "כתובת URI של קובץ שגויה:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "האם ברצונך לשלוח קובץ זה אל %s:"
 msgstr[1] "האם ברצונך לשלוח קבצים אלו אל %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_שלח"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "שלח את %s אל %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "הפוך את %s לאיש קשר ראשון"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "הפוך את %s ואת %s לאנשי קשר מוצמדים"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_שנה הודעת מצב"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "פרסם לחן"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "פרסם מיקום"
 
 # restore
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "ה_גדל את כולם"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "שלח הודעת _אשכול"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "אל כל המשתמשים"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "אל כל המשתמשים המקוונים"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "ה_זמן אל"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_נהל אנשי קשר"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "ערוך _קבוצות"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "הס_ר"
 
 # Restore שחזר
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "ה_גדל"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "_שנה שם"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "הת_חבר מחדש"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "הרץ _פקודה"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_היסטוריה"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "מנהל היסטוריה"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "משקיפים"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -2013,70 +2018,70 @@ msgstr "שיחות פרטיות"
 msgid "Messages"
 msgstr "הודעות"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "הרשאת HTTP (%(method)s) עבור %(url)s (מזהה: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "האם לקבל את בקשה זו?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "האם לקבל את בקשה זו בחשבון %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "הרשאה נשלחה"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "הרשאה נשלחה"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "לא"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "התחברות נכשלה"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "שגיאה בעת מסירת %(message)s ‏( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "בקשת הרשמה"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "התקבלה הרשאה"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "הוענקה לך הרשאה מאת \"%s\" לראות את המצב שלו או שלה."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "בקשת הרשמה"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "איש קשר \"%s\" הסיר הרשמה ממך"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2085,144 +2090,144 @@ msgstr ""
 "איש קשר זה תמיד ייראה עבורך במצב לא מקוון.\n"
 "האם ברצונך להסיר אותו מתוך הרשימת קשר שלך?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "הרשמה בוטלה"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s סרב/ה את ההזמנה: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s סרב/ה את ההזמנה"
 
 # Changed to: You have been invited to a groupchat
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "הוזמנת לשיחת קבוצה"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "נדרשת מימרת סיסמה של תעודת"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "הזן מימרת סיסמה עבור התעודה עבור חשבון %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "הזן סיסמה עבור חשבון %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "נדרשת מילת מעבר"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "שמור סיסמה"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "שגיאת העברת קובץ"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "‏%s רוצה לשלוח לך קובץ."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "בקשת העברת קובץ"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "איש קשר מרוחק הפסיק העברה"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "שגיאה בפתיחת קובץ"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "שגיאת תעודת SSL"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "העברת קובץ נעצרה"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "העברת קובץ נכשלה"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "העברת קובץ %(filename)s מן %(name)s נעצרה."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "שלחת בהצלחה את %(filename)s אל %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "העברת קובץ %(filename)s אל %(name)s נעצרה."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "העברת הקובץ %(filename)s אל %(name)s נכשלה."
 
 # התנגשויות, ניגודים, קונפליקט
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "התנגשות שם משתמש"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "אנא הקלד שם משתמש חדש עבור חשבונך המקומי"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_אישור"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "‏%s רוצה להתחיל שיחה קולית."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "בקשה לשיחה קולית"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "חיבור לא מאובטח"
@@ -2233,7 +2238,7 @@ msgstr "חיבור לא מאובטח"
 # discouraged:
 #  > deprived > לקוי בחסר
 #  > dissuade > dissuade from > להניא מ-
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2245,20 +2250,20 @@ msgstr ""
 "להימנע מחיבורים מטיפוס זה.\n"
 "האם אתה בטוח כי ברצונך להתחבר?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "מתחבר כעת"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "לא היתה אפשרות לשמור את ההגדרות וההעדפות שלך"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2462,12 +2467,12 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "פרסום vCard נכשל"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "מסירת הודעה פרטית נכשלה"
 
 # אינך עוד בשיחת קבוצה או שהמשתמש עזב
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "אינך נוכח בשיחת קבוצה \"%(room)s\" או שהמשתמש \"%(nick)s\" עזב."
@@ -2817,79 +2822,74 @@ msgid ""
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr "cli"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "‏%s הינו מדור אך אמור להיות קובץ"
 
 # Destroying is "at this moment".  It should be Destroy without ing
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "החרבת ‫%s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "שגיאת SSL לא מוכרת: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "הודעה פרטית חדשה"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "הודעה חדשה מאת %(nickname)s"
 msgstr[1] "הודעה חדשה מאת %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "שיחת קבוצה חדשה"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "המצב של %(nick)s שונה"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s מצוי/ה כעת במצב %(status)s "
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "איש קשר שינה מצב"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s התחבר/ה"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "איש קשר התחבר"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s התנתק/ה"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "איש קשר התנתק"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "אימות עם \"%s\" נכשל"
@@ -2966,67 +2966,22 @@ msgstr "אפשר הסתרת הרשימה אפילו כאשר סמל מגש אי�
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "הודע לי אודות אנשי קשר אשר מת_חברים"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "הודע לי אודות אנשי קשר אשר מת_נתקים"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "צבע התראה של הודעה/דוא״ל חדש/ה."
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "הו_דע לי כאשר העברת קובץ הושלמה"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "הו_דע לי כאשר העברת קובץ הושלמה"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-# בזמן שהם מתחברים
-# שזה עתה
-# בעת שהם
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "צבע רקע אחורי של אנשי קשר כאשר הם מתחברים."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "רשימה (מופרדת על ידי רווח) של שורות (חשבונות וקבוצות) אשר הינן מכווצות."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "ברירת מחדל"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "שפה אשר מצויה בשימוש על ידי מאיית"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3036,15 +2991,15 @@ msgstr ""
 "‏'sometimes' - הדפסת זמן כל print_ichat_every_foo_minutes דקות.\n"
 "‏'never' - לא להדפיס זמן בכלל."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "התייחסות לצמדים של * / _  בתור תווי עיצוב אפשריים."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -3053,7 +3008,7 @@ msgstr ""
 "כאשר מופעלת, אל תסיר */_ . כך שמחרוזת כגון *אבג* תהיה מובלטת כאשר * * לא "
 "מוסרים."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -3062,7 +3017,7 @@ msgstr ""
 "תו להוספה לאחר שם כינוי כאשר משתמשים בהשלמת כינוי (tab) בתוך שיחת קבוצה."
 
 # after *a* desired
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -3071,7 +3026,7 @@ msgstr ""
 "תו להציע להוספה לאחר שם כינוי רצוי כאשר זה בשימוש על ידי מישהו אחר בתוך שיחת "
 "קבוצה."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 #, fuzzy
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
@@ -3080,12 +3035,12 @@ msgstr ""
 "כאשר מופעלת, Gajim ישמור את מיקום הרשימה כאשר הרשימה מוסתרת, וישחזרה כאשר "
 "הרשימה מוצגת."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 # ראה
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3097,36 +3052,36 @@ msgstr ""
 "\" תציג \"[שעה:דקה] \". לרשותך קיים מסמך Python אודות strftime לשם תיעוד מלא "
 "בכתובת: http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "תווים אשר מודפסים לפני שם כינוי בתוך דיונים"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "תווים אשר מודפסים אחרי שם כינוי בתוך דיונים"
 
 # BUG: a dot at the end
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr "כאשר מסומן, Gajim יציג את מצבי הרוח של אנשי קשר בחלון הרשימה"
 
 # נפתחת שוב
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
 msgstr "כמה שורות לזכור מתוך דיון קודם כאשר חלון/כרטיסייה שיחה נפתחים מחדש?"
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3135,7 +3090,7 @@ msgstr ""
 "כמה שניות להמתין לפני ניסיון הצטרפות חוזרת אוטומטית לועידה אשר ממנה אנחנו "
 "מתנתקים. הגדר אל 0 כדי לנטרל הצטרפות חוזרת אוטומטית."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
@@ -3143,12 +3098,12 @@ msgstr ""
 "שגרתית של Mirabilis לקוח ICQ)."
 
 # Ctrl+מעלה
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "כמה שורות לאחסן עבור Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3157,11 +3112,11 @@ msgstr ""
 "או כתובת url מותאמת עם %s בתוכה כאשר הסימן %s הינו המילה/הצירוף או "
 "'WIKTIONARY' אשר משמעותו היא להשתמש בויקימילון."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "כאשר מסומן, Gajim יכול לפעול באופן מרוחק באמצעות gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3170,15 +3125,15 @@ msgstr ""
 "כאשר זמן לא מודפס עבור כל הודעה (print_time==sometimes), הזמן יודפס כל x "
 "דקות."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "שאל בטרם סגירת חלון/כרטיסייה של שיחת קבוצה."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3188,7 +3143,7 @@ msgstr ""
 "(שיחה, שיחה פרטית, שיחת קבוצה אשר לא תמוזער)"
 
 # תרגום כתובת/תיעול שערים
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3198,33 +3153,33 @@ msgstr ""
 "לשם העברת קובץ במקרה של address translation/port forwarding."
 
 # לפי תקן IEC
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "תקן IEC אומר KiB‏ = 1024 ביתים, KB‏ = 1000 ביתים."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "הודע על אירועים באזור ההתראה."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "האם להציג כרטיסייה כאשר ישנו רק דיון אחד?"
 
 # help translate
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "להציג מסגרת פנקס מתויג בתוך חלונות שיחה?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "האם להציג לחצן סגירה בתוך כרטיסייה?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "האם להראות תצוגה מוקדמת של הודעות חדשות בהתראה מוקפצת?"
 
 # (יש לעשות שימוש בנקודה ופסיק ; כדי להפריד בין מילים)
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3232,7 +3187,7 @@ msgid ""
 msgstr ""
 "רשימה אשר מופרדת על ידי נקודה ופסיק, של מילים שיובלטו בתוך שיחות קבוצה."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3242,22 +3197,13 @@ msgstr ""
 "כאשר מופעלת, Gajim יצא כאשר לחצן X של מנהל חלונות נלחץ. הגדרה זו נלקחת "
 "בחשבון רק כאשר סמל התראה מצוי בשימוש."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"כאשר מופעלת, Gajim יציג סמל על כל כרטיסייה המכילה הודעות אשר לא נקראו. תלוי "
-"במוטיב אשר מצוי בשימוש, סמל זה יכול להיות מונפש."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3267,7 +3213,7 @@ msgstr ""
 "איש קשר בחלון הרשימה."
 
 # right is left and left is right
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
@@ -3276,7 +3222,7 @@ msgstr ""
 "שמאל (right)"
 
 # BUG: or is better than and/or
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3285,27 +3231,27 @@ msgstr ""
 "כאשר מנוטרלת, Gajim לא ידפיס שורות מצב בתוך שיחות כאשר איש קשר משנה מצב או "
 "הודעת מצב."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "אל תציג את הרשימה בתוך שורת המשימות של המערכת."
 
 # להבהב
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3315,7 +3261,7 @@ msgstr ""
 "להבזיק (לרוב זוהי ההתנהגות השגרתית אצל מנהלי חלונות) כאשר ישנם אירועים "
 "ממתינים."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3335,7 +3281,7 @@ msgstr ""
 "‏'peracct' - הודעות עבור כל חשבון נשלחות לחלון מסוים.\n"
 "‏'pertype' - כל טיפוס הודעה (למשל, שיחות כנגד שיחות קבוצה) נשלח לחלון מסוים."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3348,34 +3294,34 @@ msgstr ""
 "‏'never' - לא להציג רשימה בכלל.\n"
 "‏'last_state' - שחזור המצב האחרון של הרשימה."
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "כאשר מנוטרלת, לא תהיה לך האפשרות לראות את האווטאר בחלון השיחה."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "כאשר מופעלת, לחיצה על המקש Esc תוביל לסגירת חלון/כרטיסייה."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "הסתרת הכרזה בחלון שיחת קבוצה"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "הסתרת הכרזה בחלון שיחת קבוצה"
 
 # הסתרת רשימת הנוכחים בשיחת קבוצה בתוך חלון שיחת קבוצה
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "הסתרת רשימת הנוכחים בחלון שיחת קבוצה."
 
 # What does "than" mean?
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3384,11 +3330,11 @@ msgstr ""
 "בשיחה, הצג את שם הכינוי בתחילת שורה רק כאשר אין זו אותה האישיות אשר מדברת "
 "מבהודעה קודמת."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "הזחה בעת שימוש בשם כינוי עוקב מובלע."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3396,7 +3342,7 @@ msgid ""
 msgstr ""
 "‏Ctrl-Tab כדי לעבור להכרטיסייה המלחינה הבאה כאשר אין כרטיסיות שלא נקראו."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3405,7 +3351,7 @@ msgstr ""
 "האם עלינו להציג דו שיח וידוא חסימת איש קשר? המשמעות של מחרוזת ריקה תהיה "
 "שאנחנו לא נציג את הדו שיח בכלל."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3414,7 +3360,7 @@ msgstr ""
 "האם עלינו להציג דו שיח וידוא חסימת איש קשר? המשמעות של מחרוזת ריקה תהיה "
 "שאנחנו לא נציג את הדו שיח בכלל."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3425,7 +3371,7 @@ msgstr ""
 "חשבון. יש להיזהר, בעת התחברותך יחד עם עדיפות שלילית, לא תתקבלנה שום הודעה "
 "מתוך השרת שלך."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3433,7 +3379,7 @@ msgid ""
 msgstr "כאשר מופעלת, Gajim יציג מספר של אנשי קשר מקוונים בשורות חשבון וקבוצה."
 
 # שממנו נשלחה
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3442,22 +3388,17 @@ msgstr ""
 "כאשר מופעלת, Gajim יגולל ויבחר את האיש קשר אשר שלח לך את ההודעה האחרונה, אם "
 "וכאשר חלון שיחה אינו פתוח כבר."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "זמן חוסר פעילות אשר נחוץ לפני שחלון שינוי מצב נסגר."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "מספר מרבי של שורות אשר יודפסו בתוך דיונים. השורות הכי ישנות יטוהרו."
 
-# חוסר
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "בחר תדירות עדכון בין 2 בדיקות של העדר פעילות."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3467,7 +3408,7 @@ msgstr ""
 "\". (mailto וגם xmpp מטופלים בנפרד)"
 
 # BUG: Dot at end
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3475,21 +3416,21 @@ msgstr ""
 "כאשר מופעלת, השלמה בתוך שיחות קבוצה תיעשה בדומה להשלמה אוטומטית במעטפת "
 "(shell) של מסוף"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr "אפשרות קיבוע פלט תדר וידאו של jingle. דוגמא: 10/1 או 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "אפשרות שינוי מידת פלט הוידאו של jingle. דוגמא: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3499,12 +3440,12 @@ msgstr ""
 "זה אשר הוגדר בתוך אפשרות \"stun_server\", או בזה אשר ניתן על ידי שרת jabber "
 "נתון."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "שרת STUN אשר ישמש אותך בעת שימוש בטכנולוגיית jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3513,7 +3454,7 @@ msgstr ""
 "כאשר מופעלת, Gajim יציג שיוך של נוכחים של שיחת קבוצה על ידי הוספת מרובע "
 "צבעוני לסמל מצב"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
@@ -3522,12 +3463,12 @@ msgstr ""
 "ציר (proxy) אשר בשימוש עבור כל החיבורים היוצאים במידה ולחשבון אין ציר מסוים "
 "מוגדר"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 #, fuzzy
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr "כאשר מופעלת, Gajim יתעלם מבקשות הקשב נכנסות (\"wizz\")."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3535,7 +3476,7 @@ msgstr ""
 "כאשר מופעלת, Gajim יפתח מחדש חלונות שיחה שהיו פתוחים בפעם האחרונה בה Gajim "
 "נסגר."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3544,11 +3485,7 @@ msgstr ""
 "כאשר מופעלת, Gajim יציג סמל המעיד על כך שהודעה אשר נשלחה התקבלה על ידי איש "
 "הקשר שלך"
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3556,38 +3493,38 @@ msgstr ""
 "כאשר מופעלת, Gajim יעשה שימוש ביישום Gnome Keyring (אם זמין) כדי לאחסן "
 "סיסמאות חשבון."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
 # BUG: a dot at the end
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3595,7 +3532,7 @@ msgid ""
 msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך"
 
 # BUG: a dot at the end
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3603,14 +3540,14 @@ msgid ""
 msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך"
 
 # BUG: a dot at the end
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3618,7 +3555,7 @@ msgid ""
 msgstr ""
 "התראות מצב שיחה שנשלחות. יכול להיות אחד מאלו all, composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3626,28 +3563,32 @@ msgid ""
 msgstr ""
 "התראות מצב שיחה שנשלחות. יכול להיות אחד מאלו all, composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_סמן את חדר זה"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3656,7 +3597,7 @@ msgstr ""
 "עדיפות תשונה אוטומטית בהתאם למצב שלך. עדיפויות מוגדרות בתוך האפשרות "
 "autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3667,32 +3608,32 @@ msgstr ""
 "לשיחה), away (נעדר), xa (לא זמין), dnd (עסוק), invisible (בלתי נראה). הערה: "
 "אפשרות זו נכנסת לשימוש רק אם ההעדפה restore_last_status מנוטרלת"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "כאשר מופעלת, המצב האחרון אשר היה בשימוש ישוחזר."
 
 # BUG: typo: the authorization of the contacts will get accepted, not the contacts themselves
 # הרשאות שיתבקשו על ידי אנשי קשר יתקבלו אוטומטית
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr "כאשר מופעלת, אנשי קשר אשר מבקשים הרשאה יתקבלו אוטומטית."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "כאשר מנוטרלת, חשבון זה ינוטרל ולא יופיע בחלון רשימה."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "אינך מחובר לשרת"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3701,15 +3642,15 @@ msgstr ""
 "הצגת דו שיח אזהרה בטרם שליחת סיסמה על פני חיבור גלוי. יכול להיות "
 "'warn' (הזהר), 'connect' (התחבר), 'disconnect' (התנתק)"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
@@ -3719,7 +3660,7 @@ msgstr ""
 "רשימה אשר מופרדת על ידי רווח, של כתובות JID עבורן אין ברצונך לאחסן רשומות. "
 "באפשרותך גם להוסיף שם חשבון כדי לא לרשום דבר עבור חשבון זה."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3729,7 +3670,7 @@ msgstr ""
 
 # INTERESTING!
 # option (אפשרות), not entry (רשומה)
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3738,7 +3679,7 @@ msgstr ""
 "כאשר מסומן, Gajim יעשה שימוש בכתובת IP ובצירים (proxy) שהוגדרו על ידך "
 "באפשרות file_transfer_proxies לשם העברת קובץ."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 #, fuzzy
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
@@ -3747,29 +3688,29 @@ msgstr ""
 "כאשר מופעלת, Gajim יבחן צירי (proxy) העברת קובץ בעת הפעלה כדי לוודא כי זו "
 "אכן פועלת. ידוע כי מתווכי Openfire נכשלים בבחינה זו אפילו אם אלו עובדים."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "כאשר מופעלת, Gajim יציג סמל המעיד על כך שהודעה אשר נשלחה התקבלה על ידי איש "
 "הקשר שלך"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "התר ל־Gajim לשלוח מידע אודות מערכת ההפעלה אשר בשימושך."
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "התר ל־Gajim לשלוח את הזמן המקומי שלך."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "הודעה אשר תישלח לאנשי קשר אותם ברצונך להוסיף"
 
 # BUG: can directly connect to
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3778,7 +3719,7 @@ msgstr ""
 "כאשר מופעלת, Gajim ישלח את כתובות IP מקומיות שלך, כך שהאיש קשר שלך יוכל "
 "להתחבר ישירות למחשב שלך כדי להעביר קבצים."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
@@ -3787,22 +3728,18 @@ msgstr ""
 "רשימה אשר מופרדת על ידי רווח, של כתובות JID עבורן אנו רוצים לפתוח מחדש חלון "
 "שיחה בהפעלה הבאה."
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "אימות תעודת SSL עבור %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3810,41 +3747,41 @@ msgid ""
 msgstr ""
 "התראות מצב שיחה שנשלחות. יכול להיות אחד מאלו all, composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "אפשור הצפנת ESessions עבור חשבון זה."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3852,7 +3789,7 @@ msgid ""
 msgstr ""
 "התראות מצב שיחה שנשלחות. יכול להיות אחד מאלו all, composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3864,84 +3801,84 @@ msgstr ""
 "משתמש גרפי במקום."
 
 # יושן
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "ישן"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "אשוב בקרוב"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "אני אחזור בעוד כמה דקות."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "אוכל"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "אני בעבודה."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "סרט"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "אני צופה בסרט."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "עובד"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "אני בעבודה."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "טלפון"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "אני בטלפון."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "בחוץ"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "יצאתי החוצה ליהנות מן החיים."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "אני זמין/ה."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "אני פנוי/ה לשיחה."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "מיד אשוב."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "אני לא זמין/ה."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "נא לא להפריע."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "להתראות!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3950,254 +3887,254 @@ msgstr ""
 "צליל לניגון כאשר הודעת שיחת קבוצה מכילה אחת מתוך המילים אשר מצוינות בתוך "
 "muc_highlight_words, או כאשר הודעת שיחת קבוצה מכילה את השם כינוי שלך."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "צליל לניגון כאשר הודעת שמ״מ מגיעה."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr ""
 
 # cli
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, fuzzy, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "שגיאה: אין אפשרות לפתוח את %s לקריאה"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "אין"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "שיחות קבוצה"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "הבלטת שיחת קבוצה:"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "הזמנת שיחת קבוצה"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "הזמנת שיחת קבוצה"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "שיחות קבוצה"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "שיחות קבוצה"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "אין"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "יצירת שיחות קבוצה הינה מוגבלת."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "שיחת קבוצה חדשה"
 
 # BUG: general title without "the"
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "השירות לא היה יכול להימצא"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "‏%s אינו שרת שיחת קבוצה"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "חשבון Local כבר ישנו."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "שיחת קבוצה <b>%s</b> לא קיימת."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "היסטוריות שיחת קבוצה"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
 # עושה
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "מבצע מטלות"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "קונה מצרכים"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "מנקה"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "מבשל"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "עושה תחזוקה"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "עושה כלים"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "עושה כביסה"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "מגנן"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "עושה שליחות קצרה"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "מוליך את הכלב"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "שותה"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "שותה בירה"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "שותה קפה"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "שותה תה"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "אוכל חטיף"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "אוכל ארוחת בוקר"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "אוכל ארוחת ערב"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "אוכל ארוחת צהריים"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "מתאמן"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "ברכיבה על אופניים"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "רוקד"
 
 # הליכה, צעידה
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "הייקינג"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "ג׳וגינג"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "משחק בספורט"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "ריצה"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "סקי"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "שחייה"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "מתעמל"
 
@@ -4206,839 +4143,839 @@ msgstr "מתעמל"
 # משפר הופעה
 # מטפח
 # מתקשטת
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "טיפוח"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "בספא"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "מצחצח שיניים"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "עושה תספורת"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "מתגלח"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "מתרחץ"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "מתקלח"
 
 # יש לי תור
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "יש לי פגישה"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "לא פעיל"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "יום חופשה"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "מבלה"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "מסתתר"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "בחופשה"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "מתפלל"
 
 # חג, חופשה, נופש מתוזמן
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "בפגרה מתוכננת"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "חושב"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "נרגע"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "דג"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "משחק"
 
 # any better word?
 # יוצאים קבוע going steady
 # יוצא
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "מסתובב בחוץ"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "חוגג"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "קורא"
 
 # מתאמן
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "מתרגל"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "בקניות"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "מעשן"
 
 # Be aware of brainwashing terms!
 # בגיבוש, מתגבש
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "מתחבר"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "משתזף"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "צופה בטלוויזיה"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "צופה בסרט"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "משוחח"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "בחיים האמיתיים"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "בטלפון"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "בוידאו־פון"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "במסע"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "ביוממות"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "בנהיגה"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "במכונית"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "באוטובוס"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "במטוס"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "ברכבת"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "בטיול"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "הולך"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "מקודד"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "בפגישה"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "לומד"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "כותב"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "מפחד"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "נדהם"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "חושק"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "זועם"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "נרגז"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "חרד"
 
 # מגורה
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "מרוגש"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "מתבייש"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "משועמם"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "אמיץ"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "רגוע"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "זהיר"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "קר"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "סמוך ובטוח"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "מבולבל"
 
 # מעורר מחשבה, שקוע במחשבות, ספקולטיבי, תיאורטי, עיוני, מחשבתי, מהורהר
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "ספקולטיבי"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "מסופק"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "רעוע"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "מטורף"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "יצירתי"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "סקרן"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "מיואש"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "מדוכא"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "מאוכזב"
 
 # תחושת גועל
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "נגעל"
 
 # מופחד מובהל מוחרד מודהם
 # מפוחד מבוהל נחרד נדהם
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "נחרד"
 
 # טרוד
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "מוטרד"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "נבוך"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "מקנא"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "נרגש"
 
 # עגבני
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "פלרטטני"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "מתוסכל"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "נעים"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "מתאבל"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "זועף"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "אשם"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "שמח"
 
 # מלא תקווה, מבטיח
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "אופטימי"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "לוהט"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "מוכנע"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "מושפל"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "רעב"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "פגוע"
 
 # מורשם, מרוגש, מלא פליאה
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "מתפעל"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "מפוחד"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "מאוהב"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "ממורמר"
 
 # מעוניין, מגלה עניין, מתעניין
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "מגלה עניין"
 
 # שתוי, מסוחרר
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "שיכור"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "בלתי מנוצח"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "מקנא"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "בודד"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "אבוד"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "בר מזל"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "דל"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "מדוכדך"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "עצבני"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "אדיש"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "נעלב"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "מזועזע"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "שובב"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "יהיר"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "רגוע"
 
 # הקלה, מורגע
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "משוחרר"
 
 # מלא חרטה
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "מתייסר"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "חסר מנוחה"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "עצוב"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "עוקצני"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "מרוצה"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "רציני"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "הלום"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "ביישן"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "חולה"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "ישנוני"
 
 # טבעי, עצמוני
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "ספונטני"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "לחוץ"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "חזק"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "מופתע"
 
 # מביע הערכה, מביע תודה
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "אסיר תודה"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "צמא"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "עייף"
 
 # בלתי מוגדר, לא ברור
 # לא צלול (unclear)
 # מטושטש, חבוי, קודר
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "מעורפל"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "חלש"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "מודאג"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "דיוק"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "גובה"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "אזור"
 
 # GPS bearing
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "הסבה"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "בניין"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "ארץ"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "מיקוד מדינה"
 
 # GPS datum
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "נתון"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "תיאור"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "שגיאה"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "קומה"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "קו רוחב"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "מקומיות"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "קו אורך"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "מיקוד דואר"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "תחום"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "חדר"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "מהירות"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "רחוב"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "תמליל"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "חותמת זמן"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "אין אפשרות לקבל תעודת מנפיק"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "אין אפשרות לקבל תעודת CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "אין אפשרות לפענח חתימת תעודה"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "אין אפשרות לפענח חתימת CRL"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "אין אפשרות לפענח מפתח ציבורי של מנפיק"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "כשל תעודת חתימה"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "כשל חתימת CRL"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "התעודה אינה תקפה עדיין"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "התעודה פקעה"
 
 # CRL what? (Certificate?)
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "‏CRL אינה תקפה עדיין"
 
 # CRL what? (Certificate?)
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "‏CRL פקעה"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "שגיאת תסדיר בשדה notBefore של התעודה"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "שגיאת תסדיר בשדה notAfter של התעודה"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "שגיאת תסדיר בשדה lastUpdate של CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "שגיאת תסדיר בשדה nextUpdate של CRL"
 
 # זיכרון אזל
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "לא נותר זיכרון"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "תעודה חתומה באופן עצמי"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "תעודה חתומה באופן עצמי בתוך שרשרת תעודה"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "אין אפשרות לקבל תעודת מנפיק מקומית"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "אין אפשרות לאמת את התעודה הראשונה"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "שרשרת תעודה ארוכה מדי"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "התעודה בוטלה"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "תעודת CA חסרת תוקף"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "מגבלת אורך נתיב מוצתה"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "תכלית תעודה לא נתמכת"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "התעודה אינה מהימנה"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "התעודה נדחתה"
 
 # התניית המנפיק אינה תואמת
 # תוכן/נושא מנפיק אינו תואם
 # קיימת אי תיאום עם/ב
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "נושא מנפיק לא תואם"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "רשות ונושא מזהה מפתח לא תואמים"
 
 # ומספר מנפיק סידורי
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "רשות ומספר סידורי של מנפיק לא תואמים"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "שימוש מפתח לא כולל חתימת תעודה"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "כשל אימות פניה"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "התעודה בוטלה"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "שגיאת SSL לא מוכרת: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "התעודה פקעה"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "התקבלה הרשאה"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "חשבון מנוטרל"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "אישורי Oauth2"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "בקשת הרשמה"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "הרחבה לא נתמכת"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "אימות עם \"%s\" נכשל"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -5102,7 +5039,7 @@ msgid "macOS"
 msgstr ""
 
 # Needs to be tested
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "שגיאת תצורת %s"
@@ -5110,7 +5047,7 @@ msgstr "שגיאת תצורת %s"
 # ההתקנה
 # הצינור (Pipeline) היה
 # השגיאה היתה
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -5129,297 +5066,252 @@ msgstr ""
 "Error was:\n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "קלט שמע"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "פלט שמע"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "קלט וידאו"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "שרת מוכרח להיות בין 1 עד 1023 תווים"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "תו שגוי בשם מארח."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "נדרשת כתובת שרת."
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "שם משתמש מוכרח להיות בין 1 עד 1023 תווים"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "תו שגוי בתוך שם משתמש."
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "משאב מוכרח להיות בין 1 עד 1023 תווים"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "תו שגוי במשאב."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_עסוק"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "עסוק"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_לא זמין"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "לא זמין"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_חופשי לשיחה"
 
 # BUG: x2
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "חופשי לשיחה"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "_זמין"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "זמין"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "מתחבר כעת"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_נעדר"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "נעדר"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "לא מ_קוון"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "לא מקוון"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "לא ידוע"
 
 # Has>Contain
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "מכיל שגיאות"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "ללא"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "אל"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "מן"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "הדדית"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "לא ידועה"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "אין"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "הרשמה"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "אין"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "אחראים"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "אחראי"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "משתתפים"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "משתתף"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "מבקרים"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "מבקר"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "ללא"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "בעלים"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "בעלים"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "מנהל"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "מנהל"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "חבר"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "חבר"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "קשוב/ה כעת לשיחה"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "עושה כעת משהו אחר"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "כותב/ת כעת הודעה..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "חדל/ה מלהלחין הודעה"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "סגר/ה את כרטיסיית או חלון השיחה"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "ממתינה לך הודעה %d"
 msgstr[1] "ממתינות לך %d הודעות"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "בתוך _שיחות קבוצה"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " מאת המשתמש %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " מאת %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "אירוע %d תלוי ועומד"
 msgstr[1] "%d אירועים תלויים ועומדים"
 
-# In Hebrew: גאג'ים
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "‫Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "‫Gajim - ‫%s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "ברצוני להוסיף אותך לרשימת הקשר שלי."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "שלום, שמי $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "תם הזמן אשר הוקצב לטעינת תמונה"
 
 # BUG: File too big
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "התמונה הינה גדולה מדי"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "‏PyCURL אינה מותקנת"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "שגיאה בטעינת תמונה"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "‏%s הינו קובץ אך אמור להיות מדור"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 #, fuzzy
 msgid "Gajim will now exit"
 msgstr "cli"
@@ -5525,89 +5417,89 @@ msgstr "מחשב על סף שינה‫"
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "ברצוני להוסיף אותך לרשימה שלי."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "קובץ ריק"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "קובץ לא קיים"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "הצפנת E2E מנוטרלת כעת"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "שנה מידע מצב"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "שנה מצב"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "קביעת טיפוס ותיאור הנוכחות"
 
 # BUG: Free for Chat
 # BUG: x2
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "חופשי לשיחה"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "מקוון"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "נעדר לזמן ארוך"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "נא לא להפריע"
 
 # Needs to be tested
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "לא מקוון - מנותק"
 
 # BUG: Remove colon because it is appearing in Psi with two colons
 # תיאור נוכחות::
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "תיאור נוכחות:"
 
 # BUG: remove "the"
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "המצב השתנה."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "איש קשר אשר נשלח: \"%s\" ‏(%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "אנשי קשר אשר נשלחו:"
 
@@ -5630,7 +5522,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "חשבון"
 
@@ -5641,7 +5533,7 @@ msgstr "שיחות קבוצה"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "סיסמה:"
@@ -5665,7 +5557,7 @@ msgstr "בתוך _שיחות קבוצה"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "ה_צטרף"
@@ -5684,17 +5576,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_ביטול"
 
@@ -5844,7 +5736,7 @@ msgstr "מידע איש קשר"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "תיאור"
 
@@ -6050,40 +5942,45 @@ msgstr "עבודה"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "אודות"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "הצטרף לשיחת קבוצה"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "אשוב בקרוב"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "ה_צטרף"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "הסרת חשבון ‫%s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "מנקה"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -6153,6 +6050,7 @@ msgid "Strike"
 msgstr "קו חוצה"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "צבע"
 
@@ -6166,141 +6064,138 @@ msgstr "גופן"
 msgid "Clear formatting"
 msgstr "איפוס עיצוב"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "הצפנת סיסמה"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "הצגת רשימת רגשונים (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "אסירה..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "הזן שם כינוי חדש עבור איש קשר %s"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "שנה שם _כינוי..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "שנה _נושא..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "הזן סיסמה חדשה:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "עזוב שיחות קבוצה"
 
 # BUG: a dot at the end
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "כאשר מסומן, Gajim יצטרף לשיחת קבוצה זו בעת הפעלה"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>אירעה שגיאה:</b>"
 
 # מאמת
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "אמת שוב..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "משתתף"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "ב_עט"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
 # מקום מפגש חלופי
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "באפשרותך להזין זירה אלטרנטיבית:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "משתתף"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "א_סור"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "שיחת קבוצה חדשה"
 
 # Destroying is "at this moment".  It should be Destroy without ing
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "החרבת ‫%s"
 
 # מקום מפגש חלופי
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "באפשרותך להזין זירה אלטרנטיבית:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "סיבה"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "הזן שם חדש עבור קבוצת %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "ה_זמן"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "טיפוס אירוע"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "תיאור אירוע"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6396,20 +6291,20 @@ msgid "Add"
 msgstr "הוסף"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "הס_ר"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "משאב:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "מצב"
 
@@ -6419,7 +6314,7 @@ msgid "Client"
 msgstr "<b>לקוח:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>מערכת:</b>"
@@ -6562,39 +6457,40 @@ msgstr "התנהגות _חלון:"
 msgid "_Show contact list on startup"
 msgstr "ה_צג רשימה בעת הפעלה:"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "מזג _חשבונות"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "הצג _אווטארים של אנשי קשר ברשימה"
 
 # BUG: a dot at the end
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6602,14 +6498,14 @@ msgid ""
 msgstr ""
 "כאשר מסומן, Gajim יציג אווטארים של אנשי קשר בחלון הרשימה ובתוך שיחות קבוצה"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "הצג הו_דעות מצב של אנשי קשר ברשימה"
 
 # BUG: a dot at the end
 # BUG: under [the] contact - remove "the"
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6618,53 +6514,53 @@ msgstr ""
 "כאשר מסומן, Gajim יציג את הודעות המצב של אנשי קשר תחת שם איש קשר בתוך חלון "
 "הרשימה וגם בתוך שיחות קבוצה"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "הצג _מידע נוסף של אנשי קשר ברשימה (מצב רוח, פעילות, ...)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "מיין אנשי קשר לפי מצב"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "אנשי קשר אשר נשלחו:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "בתוך _שיחות קבוצה"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "המרת פריט רשימה"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "בדיקת איות"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6676,30 +6572,30 @@ msgstr ""
 "במפורש באמצעות מקש ימני על שדה הקלט, השפה השגרתית תהיה בשימוש עבור איש קשר "
 "זה או שיחת קבוצה."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "cli"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "הצגת רשימת עיצובים"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "הצג הו_דעות מצב של אנשי קשר ברשימה"
 
 # BUG: or is better than and/or
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6708,174 +6604,176 @@ msgstr ""
 "כאשר מנוטרלת, Gajim לא ידפיס שורות מצב בתוך שיחות כאשר איש קשר משנה מצב או "
 "הודעת מצב."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "קיצורי מקש"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "הצג _הודעות מצב"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "האם להציג לחצן סגירה בתוך כרטיסייה?"
 
 # BUG: a dot at the end
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "האם להציג לחצן סגירה בתוך כרטיסייה?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+# BUG: a dot at the end
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך"
 
 # By last state
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "לפי מצב אחרון"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "שיחות"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "הצג סמל אזור התראה:"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "כאשר אירוע חדש מתקבל:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "התר התראות מוקפצות כאשר אני במצב נעדר/_לא זמין/עסוק/בלתי נראה"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "התר התראות מוקפצות כאשר אני במצב נעדר/_לא זמין/עסוק/בלתי נראה"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "הודע לי אודות אנשי קשר אשר מת_חברים"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "הודע לי אודות אנשי קשר אשר מת_נתקים"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>התראות חזותיות</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "נגן _צלילים"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "  נה_ל...  "
 
 # בהיותי
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "התר צלילים כאשר אני במצב _עסוק"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "צלילי Wav"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "התראות"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "לא זמין"
 
 # BUG: a dot at the end
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6885,7 +6783,7 @@ msgstr ""
 "עוד יותר"
 
 # BUG: a dot at the end
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6894,7 +6792,7 @@ msgstr ""
 "כאשר מסומן, Gajim ישנה מצב אל לא זמין כאשר המחשב לא מצוי בשימוש לזמן ממושך "
 "עוד יותר"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6907,7 +6805,7 @@ msgstr ""
 "התווים $S יוחלפו בהודעת מצב קודמת\n"
 "התווים $T יוחלפו על פי זמן תפוגה אשר מצוין עבור autoaway"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6920,21 +6818,21 @@ msgstr ""
 "התווים $S יוחלפו בהודעת מצב קודמת\n"
 "התווים $T יוחלפו על פי זמן תפוגה של autoxa"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "דקות"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "מצב אוטומטי"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
@@ -6942,20 +6840,20 @@ msgstr ""
 
 # Sign in
 # Sign out
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "שאל אותי עבור הודעת מצב בעת:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "התח_ברות"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "הת_נתקות"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6963,68 +6861,68 @@ msgstr ""
 "כאשר מופעלת, Gajim לא ישאל עבור הודעת מצב. ההודעה השגרתית אשר תצוין תהיה זו "
 "שתיכנס לתוקף במקום."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "הודעה שגרתית"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "מאופשר"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "הודעת מצב"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>הודעות מצב מותאמות</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "ערכת נושא"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "ערכת נושא"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "עיצוב גופן וצבע של הממשק"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "‏Gajim מרחוק"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "‏Gajim מרחוק"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "_צלמיות:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "השתמש בצלמיות של מו_בילים"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -7034,76 +6932,76 @@ msgstr ""
 "(למשל: עבור איש קשר אשר מצוי אצל MSN יהיה סמל מצב msn שקול עבור מצב מקוון, "
 "נעדר, עסוק, וכו׳)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "סגנון"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "תכונות"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "התקן פלט שמע"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "התקן קלט שמע"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "בדיקת קול"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "בדיקת וידאו"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "התקן קלט וידאו"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "פלט וידאו"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "תדר וידאו"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "גודל וידאו"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 #, fuzzy
 msgid "Vi_ew own video source"
 msgstr "הצג מקור וידאו עצמי"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "חיבור"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "שרת STUN:"
 
 # BUG: from a given server
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -7112,53 +7010,63 @@ msgstr ""
 "שם מארח של שרת STUN. כאשר לא ניתן, Gajim ינסה\n"
 "למצוא אחד מתוך שרת נתון."
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "קול / וידאו"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 #, fuzzy
 msgid "_Global proxy"
 msgstr "‏Proxy גלובלי:"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "  נה_ל...  "
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "רשום _שינויים של מצב אנשי קשר"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
 # BUG: a dot at the end
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "כאשר מסומן, Gajim יזכור את הסיסמה עבור חשבון זה"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>שונות</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_פתח..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "עורך תצורה מתקדם"
@@ -7343,13 +7251,13 @@ msgstr ""
 msgid "Your password"
 msgstr "הזן סיסמה חדשה:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "קיצורי מקש"
 
 # BUG: _underline
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "התאם שם מארח\\פורט"
@@ -7435,7 +7343,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "התח_ברות"
@@ -7449,7 +7357,7 @@ msgstr "אנא צור מוטיב חדש עם השם הרצוי עליך."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7477,8 +7385,8 @@ msgstr "_אפס לברירת מחדל"
 msgid "Resets value to default"
 msgstr "_אפס לברירת מחדל"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "שם מ_ארח:"
@@ -7521,7 +7429,7 @@ msgstr "הצג תעודה..."
 msgid "Proxy Host"
 msgstr "מ_ארח proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "טיפוס"
 
@@ -7535,8 +7443,7 @@ msgstr "_פרוטוקול:"
 msgid "Copy info to clipboard"
 msgstr "ה_עתק מיקום קישור"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "תכונות"
 
@@ -7729,6 +7636,12 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_שנה הודעת מצב"
 
+# In Hebrew: גאג'ים
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "‫Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>מצב רוח:</b>"
@@ -7806,9 +7719,10 @@ msgstr "מותקנים"
 
 # בעת התחלת
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr "תיאור תוסף צריך להיות מוצג כאן. תמליל זה ימחק בעת אתחול PluginsWindow."
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7995,79 +7909,107 @@ msgstr "קיצורי מקש"
 msgid "_Name"
 msgstr "_שם:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "_פרוקסי:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "התחלת שיחה"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "עזוב שיחות קבוצה"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "מנהל היסטוריה"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "תוספים"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "העדפות"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "חשבונות"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_תצוגה"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "הצג אנשי קשר _פעילים בלבד"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "הצג אנשי קשר _לא מקוונים"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "הצג אנשי קשר _פעילים בלבד"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "הצג מו_בילים"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "מסוף XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "העברות קבצים"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_עזרה"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "מקוון"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "מקוון"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "קיצורי מקש"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "תכונות"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "אודות"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -8082,6 +8024,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "עזוב שיחות קבוצה"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8376,61 +8323,69 @@ msgstr "קיצורי מקש"
 msgid "Create new group chat"
 msgstr "עזוב שיחות קבוצה"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "העדפות"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "תוספים"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "העברת קובץ"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "cli"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "הצג _מסוף XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>הופעת שיחה</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "הצג אנשי קשר _לא מקוונים"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "הצג אנשי קשר _פעילים בלבד"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "הצג אנשי קשר _פעילים בלבד"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 #, fuzzy
 msgid "Contacts"
 msgstr "איש קשר"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "מידע איש קשר"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "אנשי קשר אשר נשלחו:"
@@ -8517,12 +8472,16 @@ msgstr "מלא את הטופס."
 msgid "Group Chat Configuration"
 msgstr "הזמנת שיחת קבוצה"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "מסוף XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "התחל _שיחה..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "סינון:"
@@ -8568,11 +8527,6 @@ msgstr "הצג _אירועים ממתינים"
 msgid "Mute Sounds"
 msgstr "דומם _צלילים"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "העדפות"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8913,126 +8867,126 @@ msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "אין"
 
 # הצטרף
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s נכנס/ה לשיחת קבוצה"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "הבלטת שיחת קבוצה:"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "שיחות קבוצה"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "הבלטת שיחת קבוצה:"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "אין"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "שיחות קבוצה"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "הבלטת שיחת קבוצה:"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "אין"
 
 # BUG: general title without "the"
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "השירות לא היה יכול להימצא"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "שיחות קבוצה"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "שיחות קבוצה"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "שיחות קבוצה"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "אין"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "הזמנת שיחת קבוצה"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "סשן זה יושם בארכיון על שרת"
@@ -9061,7 +9015,7 @@ msgid "Sender: %s"
 msgstr "ממען: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "נמען: "
 
@@ -9220,7 +9174,7 @@ msgstr "קובץ: "
 msgid "It is not possible to send empty files"
 msgstr "אין זה אפשרי לשלוח קבצים ריקים"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "ממען: "
 
@@ -9235,7 +9189,7 @@ msgid "Change"
 msgstr "שנה שם _כינוי..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "אשוב בקרוב"
@@ -9267,11 +9221,12 @@ msgid "Password Change Failed"
 msgstr "נדרשת מילת מעבר"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "אירעה שגיאה בעת מהלך יצירת חשבון"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "שינוי סיסמה"
 
@@ -9308,44 +9263,37 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "שגיאת SSL לא מוכרת: %d"
 
-# שבר משולב continued fraction
-# שיחה נמשכת
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "שיחה משולבת"
+msgid "Start / Join Chat"
+msgstr "התחלת שיחה"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "אין באפשרותך להצטרף לשיחת קבוצה אלא כאשר תחובר."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "הצטרף לשיחת קבוצה"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "הוסף _איש קשר..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "cli"
 
 # השיב
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "שירות זה טרם הגיב עם מידע מפורט"
 
 # שבור, פגום
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9354,181 +9302,181 @@ msgstr ""
 "לא היה ביכולתו של שירות זה להגיב עם מידע מפורט.\n"
 "נראה כי שירות זה הינו מיושן או מקוטע"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "אחרים"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "שיחות קבוצה"
 
 # BUG: Dot
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "ללא חיבור, אין באפשרותך לעיין בשירותים זמינים"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "מציאת שירות באמצעות חשבון ‫%s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "מציאת שירות"
 
 # BUG: general title without "the"
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "השירות לא היה יכול להימצא"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr "אין שירות בכתובת אשר הזנת, או שזה אינו מגיב. בדוק את הכתובת ונסה שוב."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "השירות אינו בר עיון"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "טיפוס זה של שירות לא מכיל פריטים לעיון."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "שם שרת שגוי"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "עיון בשירותים בכתובת ‫%(address)s באמצעות חשבון ‫%(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_עיין"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "שירות זה לא מכיל פריטים לעיון."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "cli"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "ה_רשמה"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_חפש"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "ע_ריכה"
 
 # Scanned/Identified/Detected/Discovered/Found %(current)d out of %(total)d..
 # אותרו, זוהו, נמצאו
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "נסרקו %(current)d שירותים מתוך %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "משתמשים"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "מזהה"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "רשום"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "צומת"
 
 # פרסום
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "פוסט חדש"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "הי_רשם"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_בטל הרשמה"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "שלח הודעה _בודדת..."
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "cli"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "הודעה בודדת באמצעות חשבון ‫%s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "הודעה בודדת בתוך חשבון ‫%s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "הודעה בודדת"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "שליחת %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "התקבלה %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "תו לא מורשה"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "חיבור לא זמין"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "אנא ודא כי אתה מחובר בעזרת \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "אין אפשרות לשלוח הודעה אל %s, כתובת JID זו אינה תקפה."
 
 # Is there RE for Hebrew?
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "‏%s כתב/ה:\n"
@@ -9574,94 +9522,76 @@ msgstr "רישום בוצע בהצלחה"
 msgid "Registration failed"
 msgstr "רישום נכשל"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "מילון עבור שפה %s לא זמין"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"עליך להתקין מילון %s כדי לעשות שימוש בבדיקת איות, או בחר בשפה שונה על ידי "
-"הגדרת האפשרות speller_language.\n"
-"\n"
-"הדגשת מילים אשר לא אויתו כראוי לא תנוצל"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "תעודת לקוח"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "תעודה עבור חשבון ‫%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "מספר GG:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "פוקעת"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "הזמנת שיחת קבוצה"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact הזמינך לשיחת קבוצה %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "הערה: %s"
@@ -9676,6 +9606,11 @@ msgstr "מספר GG:"
 msgid "ICQ Number"
 msgstr "מספר ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "הוסף _איש קשר..."
+
 # מיבי בתים
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
@@ -9735,7 +9670,7 @@ msgstr "שגיאה בעת הוספת שירות. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9899,43 +9834,63 @@ msgstr "איש קשר מנותק"
 msgid "Contact Connected Background "
 msgstr "איש קשר מחובר"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "הודעת מצב"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "הודעת מצב"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "הודעת מצב"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "הודעת מצב"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "‏Gajim מרחוק"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "שם כינוי שגוי"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "תו לא מורשה"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את ההודעה הנבחרת?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "שם זה כבר מצוי בשימוש. האם ברצונך להחליף את הודעת המצב הקיימת?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "פעיל"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "תוספים"
@@ -9962,10 +9917,9 @@ msgid "Error: %s"
 msgstr "שגיאה: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "שגיאה"
 
@@ -9979,48 +9933,48 @@ msgstr "מצב נוכחי: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "מצב נוכחי: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "‏OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "דוא״ל חדש"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "כל הקבצים"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "מנקה"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "ניהול דיוקני Proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "_פרוקסי:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_התאם למצב"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "לא מקוון"
@@ -10041,7 +9995,7 @@ msgstr "שורת חשבון"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "חשבונך החדש נוצר בהצלחה"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -10073,60 +10027,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "חשבון \"%s\" מחובר כעת לשרת"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "סנכרון"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "מה ברצונך לעשות?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "מתחבר כעת"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "קדם הודעות אשר לא נקראו"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "לקוח Jabber/XMPP מבוסס GTK+‎"
@@ -10193,126 +10152,126 @@ msgstr ""
 "Rahut Contributors:\n"
 "  Isratine Citizen (genghiskhan AT gmx.ca)"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "בחירת קובץ לשליחה..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "בחירת ארכיון"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "כל הקבצים"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "כל הקבצים"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "שליחת קבצים"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "תמונות"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "בחירת ארכיון"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "קבצי Zip"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "שמור קובץ בשם..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "‏OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "‏%(owner_or_admin_or_member)s בשיחת קבוצה זו"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "מחובר"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "מנותק"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "שם קובץ: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "הורדה"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "העלאה"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "העברת קובץ נעצרה"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "הושהתה"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "הושהתה"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "תיאור: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "הושהתה"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "הושהתה"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "הושהתה"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "הושהתה"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "הושהתה"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "הושהתה"
@@ -10321,7 +10280,7 @@ msgstr "הושהתה"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "קובץ שגוי"
@@ -10376,25 +10335,25 @@ msgstr "הודעת שיחת קבוצה מודגשת"
 msgid "Group Chat Message Received"
 msgstr "הודעת שיחת קבוצה אשר התקבלה"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "דרוש"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "כן"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "לא"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_ביטול"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10413,11 +10372,6 @@ msgstr "באמצעות חשבון %s"
 msgid "Hide _Contact List"
 msgstr "הזמן _אנשי קשר"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "הצג אנשי קשר _פעילים בלבד"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "הסתר תפריט זה"
@@ -10464,37 +10418,32 @@ msgid ""
 msgstr "אירעה שגיאה במהלך פרסום המידע האישי שלך, נסה שוב מאוחר יותר."
 
 # ארכיונאות
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "העדפות גנזך עבור ‫%s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "ערוך העדפות _ארכיונאות"
 
 # ארכיונאות
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "העדפות גנזך עבור ‫%s"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "אינך מחובר לשרת"
+msgid "Archiving Preferences Error"
+msgstr "ערוך העדפות _ארכיונאות"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "שגיאה בקבלת dataform"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "ערוך העדפות _ארכיונאות"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "מופעלת"
@@ -10543,61 +10492,61 @@ msgstr "אין"
 msgid "?password:Hidden"
 msgstr "סיסמה:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "ערוך העדפות _ארכיונאות"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "קול / וידאו"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "יכולת לערוך שיחות קוליות וחזותיות."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "תכונה זו לא זמינה תחת Windows."
 
 # על מנת להגדיר
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10606,20 +10555,20 @@ msgstr ""
 "יכולת למדוד את הזמן אשר בו המערכת מצויה בחוסר פעילות, בכדי לקבוע מצב חיבור "
 "אוטומטי."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "יש צורך בהתקנת ספריית libxss."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10628,60 +10577,60 @@ msgstr ""
 "עריכת שיחות ברשת התקשורת המקומית, ללא שרת כלל, באמצעות איתור אוטומטי של "
 "לקוחות אחרים אשר מחוברים לאותה רשת."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "יש צורך בהתקנת python-gupnp-igd."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 "יש צורך בהתקנת ובהרצת pybonjour וגם bonjour SDK ‏(https://developer.apple.com/"
 "opensource)."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "חיבור"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "יש צורך בהתקנת libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "תכונה זו לא זמינה תחת Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "התראות"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "יכולת לערוך שיחות קוליות וחזותיות."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "יש צורך בהתקנת python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "שמור סיסמה"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
@@ -10690,34 +10639,34 @@ msgstr ""
 "סיסמאות יכולות להיות מאוחסנות בשיטה מאובטחת ולא רק בתור טקסט-גלוי "
 "(plaintext)."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "יש צורך בהתקנת gnome-keyring וגם python-gnome2-desktop, או kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "בדיקת איות"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "יש צורך בהתקנת libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
 # העברת שערים
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 #, fuzzy
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
@@ -10725,12 +10674,12 @@ msgstr ""
 "יכולת לבקש מנתב הרשת שלך (ראוטר) לעשות שימוש בתיעול שערים (Port forwarding) "
 "לשם העברת קובץ."
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "יש צורך בהתקנת python-gupnp-igd."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "ערוך העדפות _ארכיונאות"
@@ -10776,7 +10725,7 @@ msgstr "שם רשימה שגוי"
 msgid "You must enter a name to create a privacy list."
 msgstr "עליך להזין שם כדי ליצור רשימת פרטיות."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "הזמן _אנשי קשר"
@@ -10804,7 +10753,7 @@ msgstr "_סיים"
 msgid "Commands"
 msgstr "cli"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10876,120 +10825,134 @@ msgstr "בקשת הרשמה מאת %s"
 msgid "Loading"
 msgstr "כעת טוען"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "מחובר"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "אירעה שגיאה בעת מהלך יצירת חשבון"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "הסרת חשבון ‫%s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "שנה סיסמת חשבון"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "מתחבר כעת"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "השרת שלך לא תומך vCard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "תו לא מורשה"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "השרת שלך לא תומך vCard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "התחברות נכשלה"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "חשבון \"%s\" מחובר כעת לשרת"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "הוסף _איש קשר..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "יצירת פוסט חדש"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "פורט מותאם מוכרח להיות מספר פורט."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "משאב מוכרח להיות בין 1 עד 1023 תווים"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "קיצורי מקש"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "אזהרה: %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "שגיאת SSL לא מוכרת: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "הסרת חשבון ‫%s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
 # רישום
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "הירשם אל ‫%s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "שורת חשבון"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "חשבון הוסף בהצלחה"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "חשבונות"
@@ -11032,250 +10995,254 @@ msgstr "חיפוש"
 msgid "No results found"
 msgstr "אין תנובה"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "כותרת הודעת מצב"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "תמליל הודעת מצב"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "להתחבר מחדש עכשיו?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "להתחבר מחדש עכשיו?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "אם ברצונך כי השינויים יחולו באופן מידי, עליך להתחבר מחדש."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "אנא בדוק כי Avahi או Bonjour מותקן במערכת."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "אנא בדוק כי Avahi או Bonjour מותקן במערכת."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "חשבון שגוי"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "חשבון \"%s\" מחובר כעת לשרת"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "כל חלונות שיחה וחלונות שיחת קבוצה ייסגרו. האם ברצונך להמשיך?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "חשבון שגוי"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "הזמן _אנשי קשר"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "תעודת לקוח"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "התחבר בעת ה_פעלת Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "שמור רשו_מות שיחה עבור כל איש קשר"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "מצב"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "cli"
 
 # BUG: _underline
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "השתמש בצירי (proxy) העברת קובץ"
 
 # מצוי/ה בחוסר פעילות
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "בחוסר פעילות מאז %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "תעודת לקוח"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "התר ל־Gajim לשלוח מידע אודות מערכת ההפעלה אשר בשימושך."
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "הזמן _אנשי קשר"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "הת_עלם מאירועים מאת אנשי קשר שלא ברשימה"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "_עדיפות:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "השתמש במשת_ני סביבת HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "cli"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "שם פרטי:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "שם משפחה:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "דוא״ל חדש"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_התאם למצב"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 #, fuzzy
 msgid "Enable"
 msgstr "מאופשר"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_פורט:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "חיבור"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "תעודת לקוח"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "קבצי PKCS12"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "תעודת לקוח"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "התראות"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "שמור סיסמה"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "תוספים"
@@ -11339,19 +11306,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "הוסר איש קשר %d"
 msgstr[1] "הוסרו %d אנשי קשר"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "אמן לא ידוע"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "כותרת לא ידועה"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "מקור לא ידוע"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11365,20 +11332,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_סמן"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "ארכיון מושחת"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "ארכיון ריק"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "ארכיון הינו פגום"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "תוסף כבר ישנו"
@@ -11434,114 +11401,114 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "הצג _אירועים ממתינים"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "תכונות"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
 # Changed to: Spellchecking while writing.
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "בדיקת איות בעת הלחנת הודעות."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "מציאת שירות באמצעות חשבון ‫%s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "איש קשר"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "שיחות קבוצה"
@@ -11549,16 +11516,140 @@ msgstr "שיחות קבוצה"
 # (שנפתחו) לאחרונה
 # (חדרים/ערוצים) אחרונים
 # (כתובות) אחרונות
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "אחרונים:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "כשל תוסף"
 
+# שבר משולב continued fraction
+# שיחה נמשכת
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "שיחה משולבת"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "שגיאת SSL לא מוכרת: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "‫Gajim - ‫%s"
+
+# חוסר
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "בחר תדירות עדכון בין 2 בדיקות של העדר פעילות."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "מילון עבור שפה %s לא זמין"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "עליך להתקין מילון %s כדי לעשות שימוש בבדיקת איות, או בחר בשפה שונה על ידי "
+#~ "הגדרת האפשרות speller_language.\n"
+#~ "\n"
+#~ "הדגשת מילים אשר לא אויתו כראוי לא תנוצל"
+
+#~ msgid "_Reconnect"
+#~ msgstr "הת_חבר מחדש"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "הצג אנשי קשר _פעילים בלבד"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "הוסף _איש קשר..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "הזמן _אנשי קשר"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "עזוב שיחות קבוצה"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "שיחת קבוצה חדשה"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "כאשר מופעלת, Gajim יציג סמל על כל כרטיסייה המכילה הודעות אשר לא נקראו. "
+#~ "תלוי במוטיב אשר מצוי בשימוש, סמל זה יכול להיות מונפש."
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "שרת מוכרח להיות בין 1 עד 1023 תווים"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "תו שגוי בשם מארח."
+
+#~ msgid "Server address required."
+#~ msgstr "נדרשת כתובת שרת."
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "שם משתמש מוכרח להיות בין 1 עד 1023 תווים"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "תו שגוי בתוך שם משתמש."
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "משאב מוכרח להיות בין 1 עד 1023 תווים"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "תו שגוי במשאב."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "הודע לי אודות אנשי קשר אשר מת_חברים"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "הודע לי אודות אנשי קשר אשר מת_נתקים"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "צבע התראה של הודעה/דוא״ל חדש/ה."
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "הו_דע לי כאשר העברת קובץ הושלמה"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "הו_דע לי כאשר העברת קובץ הושלמה"
+
+# בזמן שהם מתחברים
+# שזה עתה
+# בעת שהם
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "צבע רקע אחורי של אנשי קשר כאשר הם מתחברים."
+
+#~ msgid "Event Type"
+#~ msgstr "טיפוס אירוע"
+
+#~ msgid "Event desc"
+#~ msgstr "תיאור אירוע"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "אינך מחובר לשרת"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "התנגשות משאב"
 
@@ -12226,9 +12317,6 @@ msgstr "כשל תוסף"
 #~ msgid "_Send Private Message"
 #~ msgstr "_שלח הודעה פרטית"
 
-#~ msgid "Send _File"
-#~ msgstr "שלח _קובץ"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "משתתפים"
@@ -15106,9 +15194,6 @@ msgstr "כשל תוסף"
 #~ "התקנתך באפשרותך לבחור פורט אחר כאן.\n"
 #~ "ייתכן כי יהיה ברצונך לשקול לשנות הגדרות חומת אש אפשריות."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "מזג _חשבונות"
-
 # הצפנת OpenPGP
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "‏OpenPGP אינה שמישה על מחשב זה"
@@ -15641,10 +15726,6 @@ msgstr "כשל תוסף"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "יש צורך בהתקנת python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr ""
-#~ "יש צורך בהתקנת gnome-keyring וגם python-gnome2-desktop, או kwalletcli."
-
 #~ msgid "Ability to connect to servers which are using SRV records."
 #~ msgstr "יכולת להתחבר לשרתים המשתמשים ברשומות SRV."
 
diff --git a/po/hr.po b/po/hr.po
index e1563a961..24bd48adb 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-10-31 20:49+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -21,77 +21,83 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Korisnički Račun"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "i autentičan"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "i NIJE autentičan"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s enkripcija %(status)s aktivna %(authenticated)s.\n"
 "Vaš razgovor %(logged)s biti zapisan."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Odabir Slike"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Zatvorit će te nekoliko kartica"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Lista Privatnosti"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Zabranjujem pristup %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "Ako pošaljete datoteku osobi %s, on/ona će znati vaš pravi Jabber ID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Nastaviti"
 
@@ -159,230 +165,222 @@ msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Prikaži _Odspojene Kontakte"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Želio bih Vas dodati na moju listu kontakata."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Pošalji Jednu _Poruku"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Izvrši Naredbu..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Upravljanje Prijenosom"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Preimenuj"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Uklo_ni"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informacije"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Pošalji _Datoteku"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Snimiti Datoteku kao..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Snimiti Datoteku kao..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Zadnji status: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Pozovi _Kontakte"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Dodaj Kontakt..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Privanti Razgovori"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Informacije"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Povijest razgovora"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Pisanje"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Svi statusi"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Pozovi _Kontakte"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Novi Grupni Razgovor"
+msgid "Rename…"
+msgstr "_Preimenuj"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Promijeni _Temu..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Novi Grupni Razgovor"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Odabir Slike"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Novi Grupni Razgovor"
+msgid "Configure…"
+msgstr "_Postavi"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Uništavam %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registracija nije uspijela"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Predefinirane poruke:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Minimiziraj kod izlaza"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Minimiziraj kod Automatskog Ulaska"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Promijeni _Nadimak..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Glas"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Izvrši Naredbu..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -390,272 +388,275 @@ msgstr[0] "Prije %i dana"
 msgstr[1] "Prije %i dana"
 msgstr[2] "Prije %i dana"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Pisanje"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Svi statusi"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Dodaj Kontakt..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "datoteka"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Pošalji Jednu _Poruku"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Otkrivanje Usluga"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Poslužitelj"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Napredno"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Postavke"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban Lista"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Postavi Oznaku"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Konfiguracija Sobe"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Sinkroniziraj"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Pošalji Poslužiteljsku Poruku..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Postavi MOTD..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Osvježi MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Izbriši MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Dodaj Kontakt..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Izmjeni Račun"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Izmjeni Račun"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Korisnički Račun"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopiraj JID/Email Adresu"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Dodaj Kontakt..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiraj Lokaciju Linka"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otvori Link u Pregledniku"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiraj JID/Email Adresu"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otvori Sastavljanje Emaila"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiraj Lokaciju Linka"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Obavijest"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopiraj JID/Email Adresu"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Po_zovi"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Odblokiraj"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Blokiraj"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Izbaci"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Zabrani"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Vlasnik"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Član"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Član"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Glas"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "JID Sobe"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "poruka"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Emotikoni:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zapisa"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Datoteka ne postoji"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM Adresa:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -663,29 +664,29 @@ msgstr "Datum"
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Poruka"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Pogreška Baze Podataka"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "kreiram bazu zabilješki"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -698,28 +699,28 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, pričekajte..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Počist_i"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Vi"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s kaže: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Obriši"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -727,7 +728,7 @@ msgstr[0] "Otkaži potvrdu"
 msgstr[1] "Otkaži potvrdu"
 msgstr[2] "Otkaži potvrdu"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -735,7 +736,7 @@ msgstr[0] "Da li zaista želite ukloniti odabranu poruku?"
 msgstr[1] "Da li zaista želite ukloniti odabranu poruku?"
 msgstr[2] "Da li zaista želite ukloniti odabranu poruku?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -743,7 +744,7 @@ msgstr[0] "Predefinirana Poruka"
 msgstr[1] "Predefinirana Poruka"
 msgstr[2] "Predefinirana Poruka"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -751,232 +752,237 @@ msgstr[0] "Da li zaista želite ukloniti odabranu poruku?"
 msgstr[1] "Da li zaista želite ukloniti odabrane poruke?"
 msgstr[2] "Da li zaista želite ukloniti odabrane poruke?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Općenito"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupa"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "U grupi"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Postavi Raspoloženje"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ništa"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna Poruka"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Statusna Poruka"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Prepiši Statusnu Poruku?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Ovo ime se već koristi. Želite prepisati ovu statusnu poruku?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Statusna Poruka"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Spremi kao Predefiniranu..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Molim unesite ime za ovu statusnu poruku"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Imam "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Ime"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete sinkronizirati sa računom ukoliko nije spojen."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Pošalji _Datoteku"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Snimiti Datoteku kao..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Neispravna Datoteka"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Izbacujem %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Ban Lista"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Soba od sada prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Soba od sada ne prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Sesija NEĆE biti sačuvana"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informacije o vama, kako stoji na poslužitelju"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Soba je sada non-anonymous"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Soba je sada semi-anonymous"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Soba je sada fully-anonymous"
@@ -991,7 +997,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Greška."
 
@@ -1020,22 +1026,22 @@ msgstr "Nova soba je stvorena"
 msgid "Failed to Configure Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s je trenutno %(status)s"
@@ -1163,81 +1169,81 @@ msgid "If you close this window, you will leave '%s'."
 msgstr ""
 "Ako zatvorite ovaj prozor, biti ćete odspojeni iz ovog grupnog razgovora."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Prikaži popis formata"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ovaj kontakt ne podržava prijenosa datoteka."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Pošalji i Zatvori"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nova Poruka"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Pošalji i Zatvori"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1246,186 +1252,177 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "veličina: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Prihvati"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Odspojen"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otvaranje Mape Sadržaja"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Druga strana je prekinula prijenos"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Greška pri čitanju datoteke"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Razmjena datoteka zaustavljena"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Prijenos datoteka otkazan"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Vezu nije moguće ostvariti."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Koristi t_ray ikonu"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Prikaži samo u _listi kontakata"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Napredni Uređivač Postavki"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Konfiguracija Sobe"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Započeti Razgovor"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Prijenosi"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Grupni Razgovori"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Odobrenje je poslano"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Ako \"%s\" prihvati ovaj zahtjev znati će te njegov/njezin status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
@@ -1435,7 +1432,7 @@ msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 msgid "desynced"
 msgstr "desinkroniziran"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1455,7 +1452,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Uvijek zatvori Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Izlaz"
@@ -1612,8 +1610,8 @@ msgstr "Preimenuj Grupu"
 msgid "Please enter a new name"
 msgstr "Molim napravite novu temu sa vašim željenim imenom."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Pre_imenuj"
@@ -1632,27 +1630,32 @@ msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Ujedno ukloni i sve kontakte iz ove grupe sa liste kontakata"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Novi Grupni Razgovor"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Spremate se ukloniti \"%(name)s\" (%(jid)s) sa vaše liste kontakata.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1662,21 +1665,21 @@ msgstr ""
 "ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek "
 "vidjeti kao da ste odspojeni."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status nakon uklanjanja"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1688,25 +1691,25 @@ msgstr ""
 "ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek "
 "vidjeti kao da ste odspojeni."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1715,13 +1718,13 @@ msgstr ""
 "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te "
 "informacije neće biti spremljene kod sljedećeg spajanja."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1732,21 +1735,21 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativan"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1754,101 +1757,102 @@ msgstr[0] "Želite li poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Želite li poslati ove datoteke kontaktu %s:"
 msgstr[2] "Želite li poslati ove datoteke kontaktu %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Poslati %s prema %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Učini %s i %s pseudokontaktima"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi Glazbu"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Izmjeni _Grupe"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Pre_imenuj"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Ponovno spajanje"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "_Izvrši Naredbu..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Povijest razgovora"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1977,70 +1981,70 @@ msgstr "Privanti Razgovori"
 msgid "Messages"
 msgstr "Poruke"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Prihvaćate li ovaj zahtjev na računu %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Odobrenje je poslano"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Odobrenje je poslano"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ništa"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Zahtjev za pretplatom"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Zahtjev za Pretplatom"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2049,150 +2053,150 @@ msgstr ""
 "Uvijek ćete vidjeti njega ili nju kao odspojenu.\n"
 "Želite li ukloniti njega ili nju sa vaše liste kontakata?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Pretplata uklonjena"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikat je istekao"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Druga strana je prekinula prijenos"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Greška pri čitanju datoteke"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Greška SSL certifikata"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspješno ste poslali %(filename)s %(name)s"
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Uredu"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Nesigurna Veza"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2202,20 +2206,20 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
 "instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Povezujem"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2420,11 +2424,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Objava vCard neuspješna"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2754,28 +2758,23 @@ msgstr ""
 "Argument \"%(arg)s\" nije određen. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je direktorij ali bi trebao biti datoteka"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Uništavam %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nepoznata SSL greška: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2783,50 +2782,50 @@ msgstr[0] "Nova poruka od %(nickname)s"
 msgstr[1] "Nova poruka od %(nickname)s"
 msgstr[2] "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je Promjenio Status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Se Prijavio"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Se Odjavio"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
@@ -2902,63 +2901,21 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Obavijesti me o kontaktima koji se _prijave"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Obavijesti me o kontaktima koji se _odjave"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Obavijesti me kada se završi prijenos datoteka"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Obavijesti me kada se završi prijenos datoteka"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Boja pozadine kontakata u trenu prijave."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "predefinirano"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2968,15 +2925,15 @@ msgstr ""
 "'sometimes' - ispisuj vrijeme svakih print_ichat_every_foo_minutes minuta.\n"
 "'never' - nikada ne ispisuj vrijeme."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Koristi * / _ parove kao znakove za formatiranje."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2985,7 +2942,7 @@ msgstr ""
 "Ako je Aktivno, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali "
 "omeđeno sa * *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2994,7 +2951,7 @@ msgstr ""
 "Znak za dodavanje nakon nadimka pri korištenju dopune nadimka (tipka tab) u "
 "grupnom razgovoru"
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -3003,17 +2960,17 @@ msgstr ""
 "Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom "
 "razgovoru već koristi željeni nadimak"
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3026,22 +2983,22 @@ msgstr ""
 "Pogledati python dokumentaciju za strftime za kompletan opis: http://docs."
 "python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Znakovi koji se ispisuju ispred nadimka u razgovorima"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Znakovi koji se ispisuju nakon nadimka u razgovorima"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr "Ako je označeno, Gajim će prikazivati raspoloženje kontakata na listi"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3050,12 +3007,12 @@ msgstr ""
 "Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/kartica "
 "razgovora ponovno otvori."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3064,19 +3021,19 @@ msgstr ""
 "Koliko sekundi čekati za ponovni pokušaj pridruživanja konferenciji sa koje "
 "ste isključeni. Postavite na 0 da bi onemogućili automatsko pridruživanje."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Pošalji poruku sa Ctrl+Enter i sa Enter napravi novu liniju. "
 "(Pretpostavljeno ponašanje Mirabilis ICQ klijenta)"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Koliko linija se sprema za Ctrl+TipkaGORE"
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3085,11 +3042,11 @@ msgstr ""
 "Ili je osobni url koji sadrži %s, gdje je %s riječ ili fraza ili "
 "'WIKTIONARY' - što znači da koristi wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolirati preko gajim-remote-a."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3098,15 +3055,15 @@ msgstr ""
 "Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati "
 "ga svakih x minuta"
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj prije zatvaranja kartice/prozora razgovora grupe."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3116,7 +3073,7 @@ msgstr ""
 "neki koji mogu izgubiti podatke (razgovor, privatni razgovor, grupni "
 "razgovor koji neće biti minimizirani)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3125,32 +3082,32 @@ msgstr ""
 "Lista računala odvojenih zarezom koje šaljemo, kao dodatak lokalnim "
 "sučeljima, za prijenos datoteka u slučaju prosljeđivanja."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definira KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Obavijesti o svim događajima u traci radne površine."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži karticu ako je otvoren samo jedan razgovor?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaži granicu notesa sa karticama u prozorima razgovora?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Prikaži gumb za zatvaranje u kartici?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3159,7 +3116,7 @@ msgstr ""
 "Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim "
 "razgovorima."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3169,22 +3126,13 @@ msgstr ""
 "Ako je Aktivno, Gajim se završava kad je pritisnut X gumb. Ova postavka je "
 "upotrebljena samo ako je \"trayicon\" u upotrebi."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Ako je Aktivno, Gajim će prikazvati ikonu na svakoj kartici koja sadrži "
-"nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3193,13 +3141,13 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati statusnu poruku, ako nije prazna, za "
 "svaki kontakt pod imenom kontakta na listi."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Definiraj poziciju avatara na listi. Mogu biti lijevo ili desno"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3208,26 +3156,26 @@ msgstr ""
 "Ako je Neaktivno, više nećete vidjeti statusnu poruku u razgovorima, kada "
 "kontakt promjeni svoj status i/ili statusnu poruku."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u programskoj traci."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3237,7 +3185,7 @@ msgstr ""
 "će bljeskati (pretpostavljeno ponašanje u većini Window Manager-a) kod novih "
 "događaja."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3258,7 +3206,7 @@ msgstr ""
 "'pertype' - Svaki tip poruke (npr., razgovori i grupni razgovori) se šalje u "
 "vezani prozor."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3266,32 +3214,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Ako je Neaktivno, nećete više vidjeti avatar u prozoru razgovora."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Ako je Aktivno, pritisak na 'esc' tipku zatvara karticu/prozor."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Skriva baner u prozoru grupnog razgovora"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Skriva baner u prozoru grupnog razgovora"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Skriva listu učesnika u prozoru grupnog razgovora."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3300,18 +3248,18 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku reda samo kada se ne radi o istoj "
 "osobi koja je pričala i u prošloj poruci."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab idi na sljedeću karticu kada nema nepročitanih."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3320,7 +3268,7 @@ msgstr ""
 "Treba li prikazati upit za potvrdu blokiranja kontakata ili ne? Prazan niz "
 "znači da nikada ne prikazujemo upit."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3329,7 +3277,7 @@ msgstr ""
 "Treba li prikazati upit za potvrdu blokiranja kontakata ili ne? Prazan niz "
 "znači da nikada ne prikazujemo upit."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3341,7 +3289,7 @@ msgstr ""
 "prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg "
 "poslužitelja."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3350,7 +3298,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati broj prisutnih i ukupnih kontakata u "
 "redovima za račune i grupe."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3359,12 +3307,12 @@ msgstr ""
 "Ako je Aktivno, Gajim će otklizati i izabrati izabrati kontakt koji vam je "
 "poslao posljednju poruku, ako prozor s razgovorom već nije otvoren."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Vrijeme neaktivnosti potrebno da bi se prozor za promjenu statusa zatvorio."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3372,11 +3320,7 @@ msgstr ""
 "Maksimalan broj linija koje se ispisuju u razgovorima. Najstarije linije se "
 "čiste."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Izaberi interval između dvije provjere nezaposlenosti."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3385,7 +3329,7 @@ msgstr ""
 "Ispravne uri sheme. Samo sheme u ovoj listi će biti prihvaćene kao \"pravi\" "
 "uri. (mailto i xmpp se obrađuju posebno)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3393,51 +3337,51 @@ msgstr ""
 "Ako je Aktivno, automatska dopuna u grupnim razgovorima će biti poput "
 "automatske dopune u sistemskoj ljusci"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3446,11 +3390,7 @@ msgstr ""
 "Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
 "odabrana predefinirana poruka."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3458,37 +3398,37 @@ msgstr ""
 "Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
 "pohranio lozinke računa."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3497,7 +3437,7 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3506,7 +3446,7 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3515,7 +3455,7 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3524,7 +3464,7 @@ msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3533,28 +3473,32 @@ msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Postavi knjižnu oznaku za sobu"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3563,7 +3507,7 @@ msgstr ""
 "Prioritet će se automatski promjeniti ovistno o vašem statusu. Prioriteti su "
 "definirani u autopriority_* opcijama."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3574,18 +3518,18 @@ msgstr ""
 "odsutan, produženo nedostupan, ne uznemiravaj, nevidljivd. PRIMJEDBA: ova "
 "postavka se koristi samo ako je restore_last_status onemogućen."
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Ako je označeno, vraća zadnji korišteni status."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr "Ako je Aktivno, Autorizacija kontakata će biti obavljena automatski."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3594,12 +3538,12 @@ msgstr ""
 "Ako je Neaktivno, ovaj račun će biti neaktivan i neće biti prikazan na listi "
 "kontakata."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3607,22 +3551,22 @@ msgid ""
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3631,7 +3575,7 @@ msgstr ""
 "Koliko sekundi čekati odgovor ping alive paketa prije nego pokušamo ponovno "
 "spajanje."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3640,20 +3584,20 @@ msgstr ""
 "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran "
 "u file_transfer_proxies opcijama za prijenos."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
 "odabrana predefinirana poruka."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3661,17 +3605,17 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3680,28 +3624,24 @@ msgstr ""
 "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran "
 "u file_transfer_proxies opcijama za prijenos."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Greška SSL certifikata"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3710,41 +3650,41 @@ msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Omogući ESessions enkripciju za ovaj račun."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3753,91 +3693,91 @@ msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Jedem"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Radim."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Radim"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Radim."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Vani"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3847,1060 +3787,1060 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Za"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Grupni Razgovori"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Grupni Razgovor"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Grupni Razgovori"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Stvaranje grupnih razgovora je ograničeno."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Usluga nije pronađena"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Ovo nije grupni razgovor"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Račun Lokalno već postoji."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Grupni razgovor %s ne postoji."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Grupni Razgovori"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Radim kućanske poslove"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Kupujem namirnice"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Čistim"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Kuham"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Popravljam"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Perem Suđe"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Perem Rublje"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Uređujem vrt"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Obavljam nešto"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Šetam psa"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Pijem"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Pijem Pivo"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Pijem Kavu"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Pijem Čaj"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Marendam"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Doručkujem"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Večeram"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Ručam"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Vježbam"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Vozim Bicikl"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Plešem"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Planinarim"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Trčim"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Bavim se Sportom"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Trčim"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Skijam"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Plivam"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "U teretani"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Uređujem se"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "U Toplicama"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Perem Zube"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Na Šišanju"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Brijem se"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Kupam se"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Tuširam se"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Na Sastanku sam"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Slobodan Dan"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Družim se"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Skrivam se"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Na Odmoru"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Molim se"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Planirani Praznik"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Razmišljam"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Opuštam se"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Pecam"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Igram se"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Izlazim"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Na tulumu"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Čitam"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Ponavljam"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Kupujem"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Pušim"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Družim se"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Sunčam se"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Gledam TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Gledam film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Telefoniram"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "Vani sam"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Koristim Mobitel"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Na Video Konferenciji"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Putujem"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Putujem na posao"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Vozim"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "U Automobilu"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "U Autobusu"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "U Avionu"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "U Vlaku"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Na Putu"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Pješačim"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programiram"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "Na Sastanku"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Učim"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Pišem"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Ustrašen"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Zapanjen"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Zaljubljen"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Ljut"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Uznemiren"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Zabrinut"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Uzbuđen"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Dosadno"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Hrabar"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Miran"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Oprezan"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Hladno"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Pouzdan"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Razmišlja"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Hirovit"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Lud"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Kreativan"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Znatiželjan"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Bezvoljan"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Zastrašen"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Smeten"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Zavidan"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Koketan"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Zahvalan"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Tuguje"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Zanovijeta"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Kriv"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Sretan"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Pun nade"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Vruć"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Skroman"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Gladan"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Povrijeđen"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Pun strahopoštovanja"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Nezadovoljan"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Zainteresiran"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Pijan"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Nepobjediv"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Izgubljen"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Sretan"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Podmukao"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Zlovoljan"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Živčan"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Uvrijeđen"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Nasilan"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Razigran"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Ponosan"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Opušten"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Umiren"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Sažaljen"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Nemiran"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Tužan"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Zajedljiv"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Zadovoljan"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Sramežljiv"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Bolestan"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Pod stresom"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Jak"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Zahvalan"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Umoran"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Neodređen"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Slab"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "predefinirano"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "morska"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Skrivam se"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Država:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Korisnički račun"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Opis"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Greška"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "jedan"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "soba"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Nemoguće dobaviti certifikat izdavača"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Nemoguće dobaviti CRL certifikata"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nemoguće dekriptirati potpis certifikata"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nemoguće dekriptirati CRL potpis"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Nije moguće dekodirati izdavačev javni ključ"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu certifikata"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Greška u CRL potpisu"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Certifikat još nije ispravan"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Certifikat je istekao"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL nije još ispravan"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Format greška u certifikatovom notBefore polju"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Format greška u certifikatovom notAfter polju"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format greška u CRL lastUpdate polju"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format greška u CRL nextUpdate polju"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Osobno potpisan certifikat u lancu"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Nemoguće dobaviti certifikat lokalnog izdavača"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Nemoguće potvrditi ispravnost prvog certifikata"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Lanac certifikata je pre dugačak"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certifikat je poništen"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Neispravan CA certifikat"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Pređeno ograničenje duljine putanje"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha certifikata"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certifikat nije pouzdan"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certifikat odbijen"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certifikat je poništen"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Certifikat je istekao"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorizacija prihvaćena"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Certifikat je istekao"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Enkripcija omogućena"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Produžetak nije podržan"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4962,12 +4902,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Konfiguracija Sobe"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4979,222 +4919,192 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Neispravan znak u imenu računala."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Potrebna je adresa poslužitelja."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Neispravan znak u korisničkom imenu."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Neispravan znak u resursu."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Zauzet"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Odsutan"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Odspojen"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Ima greške"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Pretplata koju već imamo:Ništa"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Za"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Oboje"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Nepoznat"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Sudionici"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Sudionik"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Vlasnik"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Član"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Član"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piše poruku..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5202,22 +5112,22 @@ msgstr[0] "%d poruka na čekanju"
 msgstr[1] "%d poruke na čekanju"
 msgstr[2] "%d poruka na čekanju"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "u _grupnim razgovorima"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "od korisnika %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5225,50 +5135,39 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaja na čekanju"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Želio bih Vas dodati na moju listu kontakata."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nije još ispravan"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka ali bi trebao biti direktorij"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim će se sad isključiti"
 
@@ -5371,83 +5270,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Želio bih te dodati na moju listu kontakata."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Enkripcija onemogućena"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Izmjeni informacije o statusu"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Promjeni status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Postavi tip i opis prisustva"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Spojen"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Produženo odsustvo"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Ne uznemiravaj"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Neumreženo - prekid veze"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Opis prisustva:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Status je promjenjen."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Poslan kontakt: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Poslani kontakti:"
 
@@ -5470,7 +5369,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Korisnički račun"
 
@@ -5481,7 +5380,7 @@ msgstr "Grupni Razgovori"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Lozinka:"
@@ -5505,7 +5404,7 @@ msgstr "u _grupnim razgovorima"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Pridruživanje"
@@ -5523,17 +5422,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Odustani"
 
@@ -5680,7 +5579,7 @@ msgstr "Informacije Kontakta"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Opis"
 
@@ -5887,39 +5786,44 @@ msgstr "Posao"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "O meni"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Vraćam se ubrzo"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Pridruživanje"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Uklanjanje %s računa"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5989,6 +5893,7 @@ msgid "Strike"
 msgstr "Precrtaj"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Boja"
 
@@ -6001,139 +5906,134 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Očisti oblikovanje"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Odabir Datoteke za Slanje..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Prikaži popis emoticona (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Zabranjivanje..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Promijeni _Nadimak..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Promijeni _Temu..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Unesite novu lozinku:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Pojavila se greška:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Potvrdi ponovno..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Sudionik"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Izbaci"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Sudionik"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Uništavam %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Razlog"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Unesite novo ime za grupu %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Po_zovi"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Događaj"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Događaji"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6231,20 +6131,20 @@ msgid "Add"
 msgstr "Dodaj"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Ukloni"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Resurs"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6254,7 +6154,7 @@ msgid "Client"
 msgstr "Klijent:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Sustav:</b>"
@@ -6401,38 +6301,39 @@ msgstr "_Ponašanje Prozora"
 msgid "_Show contact list on startup"
 msgstr "Prikaži _listu kontakata"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Spoji račune"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Prikaži a_vatare kontakata na listi"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6441,12 +6342,12 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Prikaži statusne _poruke kontakata na listi"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6455,53 +6356,53 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Prikaži _raspoloženje kontakata na listi"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Sortiranje kontakata po statusu"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Poslani kontakti:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Razmjena Artikla Sa Liste Kontakata"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Provjera Pravopisa"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6514,29 +6415,29 @@ msgstr ""
 "desnim klikom miša na polje za unos teksta, zadani jezik će se koristiti za "
 "dani kontakt ili grupni razgovor."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "sadržaj poruke"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Prikaži popis formata"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Prikaži statusne _poruke kontakata na listi"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6545,58 +6446,58 @@ msgstr ""
 "Ako je Neaktivno, više nećete vidjeti statusnu poruku u razgovorima, kada "
 "kontakt promjeni svoj status i/ili statusnu poruku."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Registracija nije uspijela"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Prikaži gumb za zatvaranje u kartici?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6605,62 +6506,65 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Prikaži gumb za zatvaranje u kartici?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
+"koristite"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Zadnji status: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Razgovor"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Koristi t_ray ikonu"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Kod novih događaja:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Dozvoli obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "Dozvoli obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavijesti me o kontaktima koji se _prijave"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6669,50 +6573,50 @@ msgstr ""
 "Gajim će vas obavijestiti o novim događajima sa popup prozorom u donjem "
 "desnom kutu ekrana"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavijesti me o kontaktima koji se _odjave"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Vizualne Obavijesti</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Dozvoli _zvukove"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Izmje_ni..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Dozvoli zvuk kada sam _zauzet"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav Zvuci"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Obavijesti"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Nedostupan"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6721,7 +6625,7 @@ msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Nedostupan kad se računalo ne "
 "koristi još duže."
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6730,7 +6634,7 @@ msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Nedostupan kad se računalo ne "
 "koristi još duže."
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6743,7 +6647,7 @@ msgstr ""
 "$S će biti zamjenjen sa prijašnjom porukom$T će biti zamjenjen sa auto-away "
 "vremenskim ograničenjem"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6756,40 +6660,40 @@ msgstr ""
 "$S će biti zamjenjen sa prijašnjom porukom\n"
 "$T će biti zamjenjen sa auto-not-available vremenskim ograničenjem"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minuta"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatski status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Zatraži statusnu poruku kada se:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Prijavim"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Odjavim"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6797,68 +6701,68 @@ msgstr ""
 "Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
 "odabrana predefinirana poruka."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Predefinirana Poruka"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Statusna Poruka"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Predefinirane Statusne Poruke</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Postavi boje i font sučelja"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Statusne _ikone:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Različite _ikone za prijenose"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6867,117 +6771,127 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
 "(npr. kontakt sa MSN-a će imati msn statusne ikone)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Izgled"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Mogućnosti"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Predefinirana Poruka"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Privanti Razgovori"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Veza"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Poslužitelj:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Uredi..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj račun"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Ostalo</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Napredni Uređivač Postavki"
@@ -7161,12 +7075,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Unesite novu lozinku:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Napredne Akcije"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Koristi vlastito ime poslužitelja/port"
@@ -7253,7 +7167,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Prijavim"
@@ -7267,7 +7181,7 @@ msgstr "Molim napravite novu temu sa vašim željenim imenom."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7297,8 +7211,8 @@ msgstr "_Vrati predefinirane boje"
 msgid "Resets value to default"
 msgstr "_Vrati predefinirane boje"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Ime poslužitelja:"
@@ -7342,7 +7256,7 @@ msgstr "Osobno potpisan certifikat"
 msgid "Proxy Host"
 msgstr "Proxy _Računalo:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Vrsta"
 
@@ -7356,8 +7270,7 @@ msgstr "_Protokol:"
 msgid "Copy info to clipboard"
 msgstr "_Kopiraj Lokaciju Linka"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Mogućnosti"
 
@@ -7544,6 +7457,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Izmjena Statusne Poruke"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
@@ -7620,8 +7538,8 @@ msgstr "Zaustavljeno"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7810,80 +7728,106 @@ msgstr "Registracija nije uspijela"
 msgid "_Name"
 msgstr "_Ime:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Započeti Razgovor"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Upravitelj Zapisima"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Registracija nije uspijela"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Postavke"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Izlaz"
+msgid "_Accounts"
+msgstr "Korisnički Račun"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Prikaz"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Prikaži Samo _Aktivne Kontakte"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Prikaži _Odspojene Kontakte"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Prikaži Samo _Aktivne Kontakte"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Prikaži _Prijenose"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML Konzola"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Prijenosi Datoteka"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Pomoć"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Spojen"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Spojen"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Mogućnosti"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "O meni"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7898,6 +7842,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Novi Grupni Razgovor"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8185,60 +8134,68 @@ msgstr "Razmjena Artikla Sa Liste Kontakata"
 msgid "Create new group chat"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Postavke"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "statusna poruka"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Prikaži _XML Konzolu"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Izgled Razgovora</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Prikaži _Odspojene Kontakte"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Prikaži Samo _Aktivne Kontakte"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Prikaži Samo _Aktivne Kontakte"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Informacije Kontakta"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Poslani kontakti:"
@@ -8315,12 +8272,16 @@ msgstr "Ispunite formular."
 msgid "Group Chat Configuration"
 msgstr "Poziv na Grupni Razgovor"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML Konzola"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Novi Razgovor..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
@@ -8366,11 +8327,6 @@ msgstr "Prikaži Sve _Događaje na Čekanju"
 msgid "Mute Sounds"
 msgstr "Onemogući Zvukove"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Postavke"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8690,124 +8646,124 @@ msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Grupni Razgovori"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Grupni Razgovori"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Ovaj grupni razgovor nema temu"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Grupni Razgovori"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Grupni Razgovori"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Grupni Razgovori"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Poziv na Grupni Razgovor"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Sesija NEĆE biti sačuvana"
@@ -8836,7 +8792,7 @@ msgid "Sender: %s"
 msgstr "Pošiljatelj: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Primatelj: "
 
@@ -8988,7 +8944,7 @@ msgstr "Datoteka: "
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
@@ -9003,7 +8959,7 @@ msgid "Change"
 msgstr "Promijeni _Nadimak..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Vraćam se ubrzo"
@@ -9034,11 +8990,12 @@ msgid "Password Change Failed"
 msgstr "Potrebna Lozinka"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Pojavila se greška pri stvaranju računa"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Promijeni Password"
 
@@ -9076,40 +9033,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Nastavljeni razgovor"
+msgid "Start / Join Chat"
+msgstr "Započeti Razgovor"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Dodaj Kontakt..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s nije pronađen"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis nije još pružio detaljnije informacije"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9118,33 +9070,33 @@ msgstr ""
 "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n"
 "Najvjerojatnije je zastarjela ili neispravna"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Ostali"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Grupni Razgovori"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9152,142 +9104,142 @@ msgstr ""
 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
 "pokušajte ponovo."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Ovakav tip usluge ne sadrži stvari za pretraživanje"
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Neispravno Ime Poslužitelja"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pregled %(address)s koristeći račun %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Pregled"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Pretraga"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Korisnici"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Identifikacija"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Pretplaćeno"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Čvor"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nova objava"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Pošalji Jednu Poruku"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "tema"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Znak nije dozvoljen"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Nije moguće poslati poruku na %s, ovaj JID nije ispravan."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
@@ -9333,92 +9285,75 @@ msgstr "Registracija uspijela"
 msgid "Registration failed"
 msgstr "Registracija nije uspijela"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Riječnik za jezik %s nije dostupan"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Morate instalirati %s rječnik kako bi ste mogli koristiti provjeru "
-"pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
-"opcije."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "za račun %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Broj:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Poziv na Grupni Razgovor"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact vas je pozvao na grupni razgovor %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
@@ -9433,6 +9368,11 @@ msgstr "GG Broj:"
 msgid "ICQ Number"
 msgstr "ICQ Broj:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Dodaj Kontakt..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9488,7 +9428,7 @@ msgstr "Greška prilikom dodavanja usluge. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9650,43 +9590,63 @@ msgstr "Kontakt Odspojen"
 msgid "Contact Connected Background "
 msgstr "Kontakt Spojen"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Statusna Poruka"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Statusna Poruka"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Statusna Poruka"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Statusna Poruka"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Neispravan Nadimak"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Znak nije dozvoljen"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Da li zaista želite ukloniti odabranu poruku?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Ovo ime se već koristi. Želite prepisati ovu statusnu poruku?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktivno"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Registracija nije uspijela"
@@ -9710,10 +9670,9 @@ msgid "Error: %s"
 msgstr "Greška: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Greška"
 
@@ -9727,48 +9686,48 @@ msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Čistim"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Podešavanje Proxy Profila"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Uredi prema statusu"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Odspojen"
@@ -9789,7 +9748,7 @@ msgstr "Korisnički račun"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Vaš novi račun je uspješno stvoren"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9821,60 +9780,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Sinkroniziraj"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Å to želite učiniti?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Povezujem"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Proslijedi nepročitane poruke"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber klijent"
@@ -9937,127 +9901,127 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Odabir Datoteke za Slanje..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Odabir Slike"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Sve datoteke"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Sve datoteke"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Pošalji _Datoteku"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Slike"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Odabir Slike"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Sve datoteke"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Snimiti Datoteku kao..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Spojen"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Odspojen"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Ime datoteke: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Skidanje"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Podizanje"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Razmjena datoteka zaustavljena"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Opis: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?status prijenosa:Stanka"
@@ -10066,7 +10030,7 @@ msgstr "?status prijenosa:Stanka"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Neispravna Datoteka"
@@ -10122,26 +10086,26 @@ msgstr "Označavanje Poruke Grupnog Razgovora"
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Potrebna Lozinka"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Ništa"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Odustani"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10160,11 +10124,6 @@ msgstr "koristeći račun %s"
 msgid "Hide _Contact List"
 msgstr "Pozovi _Kontakte"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Prikaži Samo _Aktivne Kontakte"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
@@ -10214,36 +10173,31 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Postavke"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Postavke"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Niste spojeni na poslužitelj."
+msgid "Archiving Preferences Error"
+msgstr "_Postavke"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Greška u primljenom podatkovnom obrascu"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Postavke"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktivno"
@@ -10292,59 +10246,59 @@ msgstr "?Pitaj (za Pretplatu):Ništa"
 msgid "?password:Hidden"
 msgstr "Lozinka:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Postavke"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Mogućnost nije dostupna za Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10352,21 +10306,21 @@ msgid ""
 msgstr ""
 "Mogućnost mjerenja vremena neaktivnosti, da bi se postavio automatski status."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Zahtijeva biblioteku libxss."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10375,100 +10329,100 @@ msgstr ""
 "Razgovori bez centralnog poslužitelja sa automatskim otkrivanjem klijenata u "
 "lokalnoj mreži."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Potreban je python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Potrebni su gpg i python-GnuPGInterface."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Veza"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Potreban je libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Mogućnost nije dostupna za Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Obavijesti"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Potreban je python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Spremiti lozinku"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Lozinke se mogu spremati sigurno, ne samo kao običan tekst."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Potrebni su gnome-keyring i python-gnome2-desktop, ili kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Provjera Pravopisa"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Potreban je libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Potreban je python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Postavke"
@@ -10516,7 +10470,7 @@ msgstr "Neispravno Ime Liste"
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Pozovi _Kontakte"
@@ -10544,7 +10498,7 @@ msgstr "_Završi"
 msgid "Commands"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10617,119 +10571,133 @@ msgstr "Zahtjev za pretplatom od %s"
 msgid "Loading"
 msgstr "Programiram"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Spojen"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Prijava"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Uklanjanje %s računa"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Kliknite za promjenu lozinke korisničkog računa"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Povezujem"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Vaš poslužitelj ne podržava Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Znak nije dozvoljen"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Veza Prekinuta"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Dodaj Kontakt..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Stvorite novi dopis"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Osobni port mora biti broj porta."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Napredne Akcije"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Zabranjujem pristup %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Uklanjanje %s računa"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registrirati se na %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Korisnički račun"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Korisnički Račun"
@@ -10772,252 +10740,256 @@ msgstr "Pretraga"
 msgid "No results found"
 msgstr "Nema rezultata"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Predefinirano"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Prijaviti se odmah?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Prijaviti se odmah?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Neispravan Račun"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Neispravan Račun"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Pozovi _Kontakte"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Osobno potpisan certifikat"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Sp_oji se prilikom pokretanja Gajima"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Spremaj _povijest razgovora za sve kontakte"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Svi statusi"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Koristi proxy za prijenos datoteka"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " od %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Pozovi _Kontakte"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tet:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_koristi HTTP__PROXY varijablu okruženja"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Ime:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Prezime:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Novi E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Uredi prema statusu"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Omogući"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Veza"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Osobno potpisan certifikat"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Spremiti lozinku"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registracija nije uspijela"
@@ -11070,19 +11042,19 @@ msgstr[0] "Uklanja kontakt sa liste"
 msgstr[1] "Uklanja kontakt sa liste"
 msgstr[2] "Uklanja kontakt sa liste"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Nepoznat Izvođač"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Nepoznat Naslov"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Nepoznat Izvor"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11096,22 +11068,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Postavi Oznaku"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Datoteka je prazna"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Servis je poslao neispravne podatke"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11168,127 +11140,238 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Mogućnosti"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Provjera pravopisa napisanih poruka."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontakti"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Grupni Razgovori"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Nedavno:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Registracija nije uspijela"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Nastavljeni razgovor"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Nepoznata SSL greška: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Izaberi interval između dvije provjere nezaposlenosti."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Riječnik za jezik %s nije dostupan"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Morate instalirati %s rječnik kako bi ste mogli koristiti provjeru "
+#~ "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
+#~ "opcije."
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Ponovno spajanje"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Izlaz"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Prikaži Samo _Aktivne Kontakte"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Dodaj Kontakt..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Pozovi _Kontakte"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Novi Grupni Razgovor"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Novi Grupni Razgovor"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Ako je Aktivno, Gajim će prikazvati ikonu na svakoj kartici koja sadrži "
+#~ "nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Neispravan znak u imenu računala."
+
+#~ msgid "Server address required."
+#~ msgstr "Potrebna je adresa poslužitelja."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Neispravan znak u korisničkom imenu."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Neispravan znak u resursu."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Obavijesti me o kontaktima koji se _prijave"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Obavijesti me o kontaktima koji se _odjave"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Obavijesti me kada se završi prijenos datoteka"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Obavijesti me kada se završi prijenos datoteka"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Boja pozadine kontakata u trenu prijave."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Događaj"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Događaji"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Niste spojeni na poslužitelj."
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Konflikt Resursa"
 
@@ -11922,9 +12005,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Pošalji Privatnu Poruku"
 
-#~ msgid "Send _File"
-#~ msgstr "Pošalji _Datoteku"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Sudionici"
@@ -14149,10 +14229,6 @@ msgstr "Registracija nije uspijela"
 #~ msgstr "Zaustavljeno"
 
 #, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Registracija nije uspijela"
-
-#, fuzzy
 #~ msgid "Security error during download"
 #~ msgstr "Sigurnosna greška prilikom spajanja na \"%s\""
 
@@ -14668,9 +14744,6 @@ msgstr "Registracija nije uspijela"
 #~ "za vaše postavke, ovdje možete odabrati neki drugi.\n"
 #~ "Mogli bi ste uzeti u obzir mogućnost izmjene postavki vatrozida."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Spoji račune"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP nije upotrebljiv na ovom računalu"
 
@@ -15152,9 +15225,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Potreban je python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Potrebni su gnome-keyring i python-gnome2-desktop, ili kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/hu.po b/po/hu.po
index 821be1363..a021671f3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2010-11-28 12:15+0100\n"
 "Last-Translator: Gabriel Papp <gabriel.papp@gmx.com>\n"
 "Language-Team: -\n"
@@ -17,77 +17,83 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Fiókok"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "és hitelesített"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "és NEM hitelesített"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)ok titkosítás %(status)ok aktív %(authenticated)s.\n"
 "A beszélgetési munkamenet %(logged)k naplózot(ak)."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Válassz képet"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Több lap bezárása előtt állsz"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Biztosan el szeretnéd hagyni ezt a közös beszélgetést: \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "_Ne kérdezzen meg újra"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Magánéleti lista"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "%s bannolása"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 "Ha egy filet küldesz neki: %s, akkor tudni fogja a valós Jabber Azonosítód."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 #, fuzzy
 msgid "_Continue"
 msgstr "_Continue"
@@ -156,500 +162,495 @@ msgstr "Nincs függő feliratkozási kérelem."
 msgid " resource with priority "
 msgstr " erőforrás prioritással "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Mutassa a kijelentkezett partnereket"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Fel szeretnélek venni a partnerlistámra."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "_Levél küldése"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Parancs _futtatása"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "Transzport _kezelése"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "Transzport _módosítása"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "Át_nevez"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "Tiltás _Feloldása"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Tiltás"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Eltá_volít"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Információ"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "_File Küldése"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "File mentése másként..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "File mentése másként..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Legutóbbi állapot: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "_Partnerek Meghívása "
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Élőszavas beszélgetés kérelem"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Videó teszt"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Információ"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Előzmények"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Kikapcsolva"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Csak fogalmazás"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Minden beszélgetésállapot"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "_Partnerek Meghívása "
+msgid "All Chat States"
+msgstr "Minden beszélgetésállapot"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Csoportos beszélgetések elhagyása"
+msgid "Rename…"
+msgstr "Át_nevez"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "_Beszélgetőtéma megváltoztatása..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Csoportos beszélgetések elhagyása"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Válassz képet"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Új közös beszélgetés"
+msgid "Configure…"
+msgstr "_Beállítás"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "%s törlése"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Regisztráció nem sikerült"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Log status changes of contacts"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Sablonüzenetek:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Tálcára helyezés bezáráskor"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Tálcára helyezés automatikus csatlakozáskor"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Becenév _megváltoztatása..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hang"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "Parancs _futtatása"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Csak fogalmazás"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Minden beszélgetésállapot"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "_Levél küldése"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Szolgáltatások felderítése"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Szerver"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Haladó"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Tulajdonságok"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban lista"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Könyvjelző"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Szoba Konfiguráció"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Szinkronizálás"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Magánéleti listák"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Szerverüzenet küldése..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "MOTD Beállítása..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "MOTD Frissítése..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "MOTD Törlése"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Fiók módosítása"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Fiók módosítása"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Fiókok"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "JID/E-mail Cím _Másolása"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Beszélgetés kezdeményezése"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Ismerős hozzáadása..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Link Helyének _Másolása"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Link _Megnyitása Böngészőben"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "JID/E-mail Cím _Másolása"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "E-Mail Szerkesztő _Megnyitása"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "Link Helyének _Másolása"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Tartózkodási hely: %s"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "JID/E-mail Cím _Másolása"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Meg_hív"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "Tiltás _Feloldása"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Tiltás"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Kick"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Ban"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Tulajdonos"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Tag"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Tag"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Hang"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Szoba Jabber Azonosítója"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "üzenet"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Hangulatjelek:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Nem található az előzménynapló adatbázisa"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "A file nem létezik"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM cím:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dátum"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -657,29 +658,29 @@ msgstr "Dátum"
 msgid "Nickname"
 msgstr "Becenév"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Üzenet"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Tárgy"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Adatbázis hiba"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "gyorsítótár adatbázis létrehozása"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -692,188 +693,188 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Tisztítás"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Te üzeneted"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, fuzzy, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Törlés"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Megerősítés megszakítása"
 msgstr[1] "Megerősítés megszakítása"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Biztosan szeretnéd törölni a kiválasztott üzenetet?"
 msgstr[1] "Biztosan szeretnéd törölni a kiválasztott üzenetet?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Alapértelmezett üzenet"
 msgstr[1] "Alapértelmezett üzenet"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Biztosan szeretnéd törölni a kiválasztott üzenetet?"
 msgstr[1] "Biztosan szeretnéd törölni a kiválasztott üzeneteket?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Partner neve: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Általános"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Csoport"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "A csoportban"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Hangulat beállítása"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Egyik sem"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Állapot üzenet"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Állapot üzenet"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Felülítja az állapotüzenetet?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Ez a név már használatban van. Felül szeretnéd írni ezt az állapotüzenetet?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Állapot üzenet"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Mentés Sablonként..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Kérlek írj be egy nevet ehhez az állapotüzenethez"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Van "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Állapot"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Nem csatlakozol a szerverhez"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Kapcsolat nélkül nem szinkronizálhatod a partnereid."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Név"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Szerver"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Ez a fiók nem kapcsolódik a szerverhez"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Addig nem szinkronizálhatod a fiókkal amíg csatlakozva van."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Szinkronizálás"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "egy hang és videó"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "egy hang"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "egy videó"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -882,94 +883,99 @@ msgstr ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "_File Küldése"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "File mentése másként..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Fileküldés Befejezve"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Érvénytelen file"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Nem lehet a képet betölteni"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "%s kirúgása"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Ban lista"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Írd be a becenevet"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Élőszavas beszélgetés kérelem"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s has set the subject to %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "A szoba mostantól mutatja a nem elérhető tagokat"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "a szoba mostantól nem mutatja a nem elérhető tagokat"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "A munkamenet NEM LESZ naplózva"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Information about you, as stored in the server"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "A szoba mostantól teljesen anonymous"
@@ -984,7 +990,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Hiba."
 
@@ -1014,22 +1020,22 @@ msgstr "Egy új szoba lett létrehozva"
 msgid "Failed to Configure Group Chat"
 msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Mostantól így szerepelsz: %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s mostantól így szerepel: %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Mostantól így szerepelsz: %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s mostantól %(status)s"
@@ -1156,81 +1162,81 @@ msgstr "Biztosan el szeretnéd hagyni ezt a közös beszélgetést: \"%s\"?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Ha bezárod ezt az ablakot akkor kilépsz ebből a közös beszélgetésből."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr ""
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ez a partner nem támogatja a fileátvitelt."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, fuzzy, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)ok állapot : %(state)ok, indok: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)ek a csoportos beszélgetésből %(room_name)ek"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Mellőzd ezt a hibát ehhez a tanusítványhoz."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Új üzeneted érkezett tőle: \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Küld & Bezár"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Új üzenet"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Küld & Bezár"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1239,186 +1245,177 @@ msgstr ""
 "Tárgy: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s mostantól %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Fileátvitelek"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Méret: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_Fiókok"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Kijelentkezett"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Fileátvitel befejezve"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Open Containing Folder"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Meghívó közös társalgásba"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "A partner megállította a fileátvitelt"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Hiba a file megnyitása közben"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Fileátvitel megállítva"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Fileátvitel megszakítva"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Nem létesíthető kapcsolat a partnerrel."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Csak a főablakban jelenítse meg"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Bővített Konfiguráció Szerkesztő"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s konfiguráció hiba"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Összes függő esemény mutatása"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Megnyit egy ablakot a következő függő eseménnyel"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Beszélgetés kezdeményezése"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Adatbázis hiba"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Összevont fiókok"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transzportok"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Engedély elküldve"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Now \"%s\" will know your status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Feliratkozási kérelem elküldve"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Engedély eltávolítva"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
@@ -1428,7 +1425,7 @@ msgstr "Now \"%s\" will always see you as offline."
 msgid "desynced"
 msgstr "szétkapcsolt"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1449,7 +1446,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Always close Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
@@ -1613,8 +1611,8 @@ msgstr "Rename Group"
 msgid "Please enter a new name"
 msgstr "Kérlek készíts egy tiszta új témát a kívánt névvel."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Át_nevezés"
@@ -1634,27 +1632,32 @@ msgstr "Do you want to remove group %s from the roster?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Also remove all contacts in this group from your roster"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Csoportos beszélgetések elhagyása"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Kérlek írj be egy új felhasználónevet a helyi fiókodhoz"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Eltávolítja a partnert a névsorról"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1663,22 +1666,22 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Eltávolítja a partnert a névsorról"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1689,27 +1692,27 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 #, fuzzy
 msgid "No account available"
 msgstr "No account available"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 #, fuzzy
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1718,13 +1721,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1735,121 +1738,122 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreatív"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Érvénytelen file URI:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Szeretnéd ezt a fájlt elküldeni neki(k)? %s:"
 msgstr[1] "Szeretnéd ezeket a fájlokat elküldeni neki(k)? %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Küld"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s to %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "Állapot üzenet _megváltoztatása"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Éppen hallgatott zeneszám címének közzététele"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Tartózkodási hely közzététele"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "Mindet _teljes képernyőre"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Közös _beszélgetési üzenet küldése"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Az összes felhasználónak"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Az összes jelenlévő felhasználónak"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Meg_hívás ide:"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "Partnerek _kezelése"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "_Csoportok szerkesztése"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Teljes képernyő"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Át_nevezés"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "Újracsatlakozás"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "Parancs _futtatása"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Előzmények"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Előzménykezelő"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Megfigyelők"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1979,70 +1983,70 @@ msgstr "Privát beszélgetések"
 msgid "Messages"
 msgstr "Üzenetek"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Elfogadod ezt a felkérést?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Do you accept this request on account %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Engedély elküldve"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Engedély elküldve"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Egyik sem"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Kapcsolat megszakadt"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "hiba ennek a küldése során %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Feliratkozási kérelem"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Engedély elfogadva"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Feliratkozási kérelem"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2051,149 +2055,149 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Leiratkozva"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Meghívtak közös társalgásba"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "A tanusítvány lejárt"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Írd be a jelszavad a következő fiókhoz: %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Jelszó szükséges"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Jelszó megjegyzése"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Fileátvitel hiba"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s egy filet szeretne küldeni neked."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Fileátviteli kérelem"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "A partner megállította a fileátvitelt"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Hiba a file megnyitása közben"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL tanusítvány hiba"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Fileátvitel megállítva"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Fileküldés Befejezve"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, fuzzy, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "felhasználónév összeférhetetlenség"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Kérlek írj be egy új felhasználónevet a helyi fiókodhoz"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s szeretne élőszóban beszélni veled."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Élőszavas beszélgetés kérelem"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Nem biztonságos kapcsolat"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2204,20 +2208,20 @@ msgstr ""
 "azt jelenti, hogy az összes beszélgetésed titkosítatlanul fog továbbítódni. "
 "Biztosan ezt szeretnéd tenni?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Csatlakozás"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Nem lehet elmenteni a beállításaid."
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2425,11 +2429,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard közzététel nem sikerült"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Nem sikerült elküldeni a privát üzenetet"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
@@ -2764,78 +2768,73 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s egy könyvtár de lehetne egy file is"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "%s törlése"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Ismeretlen SSL hiba: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Új privát üzenet"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Új üzenet tőle: %(nickname)s"
 msgstr[1] "Új üzenet tőle: %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Új közös beszélgetés"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s megváltoztatta állapotát"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s mostantól %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "A partner megváltoztatta az állapotát"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s bejelentkezett"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Partner bejelentkezett"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s kijelentkezett"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Partner kijelentkezett"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Nem sikerült a hitelesítés vele \"%s\""
@@ -2909,64 +2908,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Notify me about contacts that sign _in"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Notify me about contacts that sign _out"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Preview new messages in notification popup?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Notify me when a file transfer is complete"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Notify me when a file transfer is complete"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Background colour of contacts when they just signed in."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "alapértelmezett"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Beszélő által használt nyelv"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2976,16 +2933,16 @@ msgstr ""
 "'néha' - print time every print_ichat_every_foo_minutes minute.\n"
 "'soha' - soha ne írja ki az időpontot."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 #, fuzzy
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2993,7 +2950,7 @@ msgid ""
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -3002,7 +2959,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -3011,17 +2968,17 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3033,23 +2990,23 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "If ticked, Gajim will display the mood of contacts in the roster window"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3058,12 +3015,12 @@ msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3072,19 +3029,19 @@ msgstr ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3093,12 +3050,12 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 #, fuzzy
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3107,16 +3064,16 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 #, fuzzy
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3125,7 +3082,7 @@ msgstr ""
 "Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimised)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3134,37 +3091,37 @@ msgstr ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 #, fuzzy
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 #, fuzzy
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 #, fuzzy
 msgid "Show close button in tab?"
 msgstr "Mutassa a bezárás gombot a füleken?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3172,7 +3129,7 @@ msgid ""
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3182,22 +3139,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3206,13 +3154,13 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Define the position of the avatar in roster. Can be left or right"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3221,26 +3169,26 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3250,7 +3198,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3271,7 +3219,7 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3279,32 +3227,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Elrejti a bannert ebben a közös beszélgetőablakban"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Elrejti a bannert ebben a közös beszélgetőablakban"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3313,19 +3261,19 @@ 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."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3334,7 +3282,7 @@ msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3343,7 +3291,7 @@ msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3354,7 +3302,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."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3363,7 +3311,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3372,12 +3320,12 @@ msgstr ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 #, fuzzy
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Time of inactivity needed before the change status window closes down."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 #, fuzzy
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
@@ -3386,12 +3334,7 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: gajim/common/config.py:238
-#, fuzzy
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Choose interval between 2 checks of idleness."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3400,27 +3343,27 @@ msgstr ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr "If True, completion in groupchats will be like a shell auto-completion"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Optionally resize jingle output video. Example: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3429,12 +3372,12 @@ msgstr ""
 "If True, Gajim will try to use a STUN server when using jingle. The one in "
 "\"stun_server\" option, or the one given by the jabber server."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "STUN server to use when using jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3443,23 +3386,23 @@ msgstr ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "coloured square to the status icon"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3468,11 +3411,7 @@ msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3480,37 +3419,37 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3519,7 +3458,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3528,7 +3467,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3537,7 +3476,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3545,7 +3484,7 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3553,28 +3492,32 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Szoba felvétele a _könyvjelzők közé"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3583,7 +3526,7 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3593,19 +3536,19 @@ 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"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "If enabled, restore the last status that was used."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 "If True, Contacts requesting authorisation will be automatically accepted."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3613,12 +3556,12 @@ msgid ""
 msgstr ""
 "If False, this account will be disabled and will not appear in roster window."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Nem csatlakozol a szerverhez"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3626,22 +3569,22 @@ msgid ""
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3650,7 +3593,7 @@ msgstr ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3659,20 +3602,20 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3680,17 +3623,17 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s egy filet szeretne küldeni neked."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Message that is sent to contacts you want to add"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3699,28 +3642,24 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "SSL tanusítvány hiba"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3728,41 +3667,41 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Enable ESessions encryption for this account."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3770,91 +3709,91 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Alszik"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Nemsokára vagyok"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Néhány perc múlva vagyok."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Eszik"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Dolgozom."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Filmet nézek."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Munka"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Dolgozom."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Telefonálok."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Szabadban"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Kint vagyok a szabadban, élvezem az életet."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Elérhető vagyok."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Ráérek beszélgetni."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Nemsokára vagyok."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Nem vagyok elérhető."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Ne zavarjanak."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3863,1070 +3802,1070 @@ 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."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "neki"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Hiba: nem lehet %s-t megnyitni olvasásra"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Nincs"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Közös beszélgetés üzenet kiemelése"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Meghívó közös társalgásba"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Meghívó közös társalgásba"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Csoportos beszélgetés"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Nincs"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Közös beszélgetés létrehozása korlátozva van."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Új közös beszélgetés"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "A szolgáltatás nem található"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Ez nem egy közös társalgás"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "A Helyi fiók már létezik."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Group chat %s does not exist."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Groupchat Histories"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Házimunkát csinál"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Bevásárol"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Takarít"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Főz"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Karbantart"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Mosogat"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Mos"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Kertészkedik"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Megbízást teljesít"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Kutyát sétáltat"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Iszik"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Sörözik"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Kávézik"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Teázik"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Harap valamit"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Reggelizik"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Vacsorázik"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Ebédel"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Edz"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Bringázik"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Táncol"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Túrázik"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Kocog"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Sportol"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Fut"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Síel"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Úszik"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Kondizik"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Ápolja magát"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "A gyógyfürdőben"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Fogat mos"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Fodrásznál van"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Borotválkozik"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Fürdik"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Tusol"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Találkozón van"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inaktív"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Szabadnap"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Kiruccan"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Rejtőzködik"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Vakáción"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Imádkozik"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Tervezett szabadság"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Gondolkodik"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Relaxál"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Horgászik"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Jászik"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Kiment"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Partizik"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Olvas"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Rehearsing"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Vásárol"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Cigizik"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Szocializálódik"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Napozik"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Tévézik"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Filmet néz"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Beszélget"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "Kint van a való világban"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Telefonál"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Videótelefonál"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Utazik"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Ingázik"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Vezet"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "Autóban"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "Buszon"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "Repülőn"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Vonaton"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Túrán"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Sétál"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programozik"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "Találkozón"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Tanul"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Ír"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Fél"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Meghökkent"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Belezúgott"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Mérges"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Bosszús"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Aggódó"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Érdeklődő"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Szégyelli magát"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Unatkozik"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Bátor"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Nyugodt"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Elővigyázatos"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Hideg"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Magabiztos"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Összezavarodott"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Elmélkedő"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Elégedett"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Házsártos"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Őrült"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Kreatív"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Kíváncsi"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Levert"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Lehangolt"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Kiábrándult"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Felháborodott"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Megdöbbent"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Zaklatott"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Feszélyezett"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Irígy"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Izgatott"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Kacér"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frusztrált"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Hálás"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Gyászol"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Zsémbes"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Bűnös"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Boldog"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Reményteli"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Hot"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Megaláztatott"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Megalázott"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Éhes"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Megsebesült"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Impressed"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Félelemben"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Szerelmes"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Méltatlankodó"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Érdeklődő"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Mámoros"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Legyőzhetetlen"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Féltékeny"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Magányos"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Elveszett"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Szerencsés"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Középszerű"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Rosszkedvű"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Ideges"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Normális"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Sértődött"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Felháborodott"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Játékos"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Büszke"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Nyugodt"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Megkönnyebbült"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Bűnbánó"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Nyughatatlan"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Szomorú"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Gúnyos"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Elégedett"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Komoly"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Döbbent"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Félénk"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Beteg"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Álmos"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontán"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Stresszes"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Erős"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Meglepett"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Hálás"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Szomjas"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Fáradt"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Nem meghatározott"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Gyenge"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Aggódó"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "alapértelmezett"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "tengerész"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Rejtőzködik"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Fiók"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Fiók sor"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Leírás"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Hiba"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "egy"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "room"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 #, fuzzy
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 #, fuzzy
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 #, fuzzy
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 #, fuzzy
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Nem lehet dekódolni a kibocsátó publikus kulcsát"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Tanusítvány aláírás hiba"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "CRL aláírás hiba"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Az tanusítvány még nem érvényes"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "A tanusítvány lejárt"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL még nem érvényes"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL lejárt"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 #, fuzzy
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 #, fuzzy
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 #, fuzzy
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 #, fuzzy
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Saját magunk által aláírt tanusítvány"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Saját magunk által aláírt tanusítvány a tanusítványláncon"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Nem lehet lekérni a helyi kibocsátó tanusítványát"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Nem lehet ellenőrizni az első tanusítványt"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "A tanusítványlánc túl hosszú"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Tanusítvány érvénytelenítve"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Érvénytelen CA tanusítvány"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Az elérési útvonal elérte a megengedett maximális hosszát"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Nem támogatott tanusítvány cél"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "A tanusítvány nem megbízható"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Tanusítvány visszautasítva"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Téma kibocsátó eltérés"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 #, fuzzy
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 #, fuzzy
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "A kulcshasználat nem tartalmazza a tanusítvány aláírást"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Alkalmazás ellenőrzési funkció"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Tanusítvány érvénytelenítve"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Ismeretlen SSL hiba: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "A tanusítvány lejárt"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Engedély elfogadva"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Fiók kikapcsolva"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "A tanusítvány lejárt"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Feliratkozási kérelem"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Kiterjesztés nem támogatott"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Nem sikerült a hitelesítés vele \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4988,12 +4927,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s konfiguráció hiba"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -5012,292 +4951,251 @@ msgstr ""
 "hiba volt:\n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "hang bemenet"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "hang kimenet"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "videó bemenet"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Nem megfelelő karakter van a hosztnévben."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Szerver cím szükséges."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Nem megfelelő karakter van a felhasználónévben."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Nem megfelelő karakter van az erőforrásban."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "El_foglalt"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Nem elérhető"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Nem elérhető"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Ráér beszélgetni"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Ráér beszélgetni"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "_Elérhető"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "Elérhető"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Csatlakozás"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Távol"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Távol"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Kijelentkezett"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Kijelentkezett"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Ismeretlen"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Hibái vannak"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Nincs"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "neki"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Feladó"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "mindkét"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Egyik sem"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Nincs"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderátorok"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Résztvevők"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Résztvevő"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Látogatók"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Látogató"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nincs"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Tulajdonos"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Tulajdonos"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Adminisztrátor"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Tag"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Tag"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "figyeli a beszélgetést"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "valami mást csinál"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "üzenetet fogalmaz..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "üzenetet fogalmaz, de nem gépel"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "bezárta a beszélgetőablakot, vagy fület"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d függő üzenet"
 msgstr[1] "%d függő üzenetek"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "_csoportos beszélgetésekben"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " felhasználótól %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " tól/től %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d függő esemény"
 msgstr[1] "%d függő események"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Fel szeretnélek venni a partnerlistámra."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Szia! Én $name vagyok."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Időtúllépés a kép betöltése közben"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Túl nagy a kép"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL még nem érvényes"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Időtúllépés a kép betöltése közben"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s egy file de lehetne egy könyvtár is"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim most kilép"
 
@@ -5400,83 +5298,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Fel szeretnélek venni a névsoromba."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "A file üres"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "A file nem létezik"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E titkosítás kikapcsolva"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Állapot információ változtatás"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Állapot megváltoztatása"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Jelenlét típusának és leírásának beállítása"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Ráér beszélgetni"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Online"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Kiterjesztett távollét"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Ne zavarj"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Offline - lecsatlakozva"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Jelenlét leírása:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Az állapot megváltozott."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Elküldött partner: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Elküldött partnerek:"
 
@@ -5499,7 +5397,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Fiók"
 
@@ -5510,7 +5408,7 @@ msgstr "Csoportos beszélgetések"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
@@ -5534,7 +5432,7 @@ msgstr "_csoportos beszélgetésekben"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Csatlakozás"
@@ -5552,17 +5450,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Mégse"
 
@@ -5710,7 +5608,7 @@ msgstr "Személyes információk"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Leírás"
 
@@ -5915,39 +5813,44 @@ msgstr "Munka"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Magamról"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Nemsokára vagyok"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "%s fiók törlése"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -6016,6 +5919,7 @@ msgid "Strike"
 msgstr "Áthúzás"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Szín"
 
@@ -6028,137 +5932,134 @@ msgstr "Betűtípus"
 msgid "Clear formatting"
 msgstr "Formázás törlése"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Válasszon kliens tanusítványt"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 msgid "Show a list of emojis (Alt+M)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Bannolás..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Enter a new nickname for contact %s"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Becenév _megváltoztatása..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "_Beszélgetőtéma megváltoztatása..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Írja be az új jelszót:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Ha be van pipálva, induláskor a Gajim automatikusan csatlakozni fog ehhez a "
 "csoportos beszélgetéshez"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Hiba lépett fel:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Újra hitelesít..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Résztvevő"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Kick"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Ha szeretnél, beírhatsz egy alternatív értéket:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Résztvevő"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Ban"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Új közös beszélgetés"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "%s törlése"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Ha szeretnél, beírhatsz egy alternatív értéket:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Indok"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Enter a new name for group %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Meg_hív"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Esemény típusa"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Esemény leírása"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6254,20 +6155,20 @@ msgid "Add"
 msgstr "Hozzáad"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Eltávolítás"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Erőforrás:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Állapot"
 
@@ -6277,7 +6178,7 @@ msgid "Client"
 msgstr "<b>Kliens:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Rendszer:</b>"
@@ -6421,38 +6322,39 @@ msgstr "_Ablak viselkedés:"
 msgid "_Show contact list on startup"
 msgstr "C_satlakozás a Gajim indításával"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Fiókok _egyesítése"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Partnerek a_vatarjainak megjelenítése a főablakban"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6461,12 +6363,12 @@ msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Partnerek állapotüz_eneteinek megjelenítése a főablakban"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6475,53 +6377,53 @@ msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Partnerek tartózkodási _helyének megjelenítése a főablakban"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Partnerek állapot szerinti rendezése"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Elküldött partnerek:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "_csoportos beszélgetésekben"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Névsor elem cseréje"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Helyesírás-ellenőrző"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6533,29 +6435,29 @@ msgstr ""
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "üzenet tartalma"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Tartózkodási hely: %s"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Partnerek állapotüz_eneteinek megjelenítése a főablakban"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6564,58 +6466,58 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Regisztráció nem sikerült"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Log status changes of contacts"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Mutassa a bezárás gombot a füleken?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6624,114 +6526,117 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Mutassa a bezárás gombot a füleken?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Legutóbbi állapot: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Beszélgetések"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Ha új esemény érkezik:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notify me about contacts that sign _in"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notify me about contacts that sign _out"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Képi értesítések</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "_Hangok lejátszása"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Ke_zelés..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Engedélyezze a hangokat _elfoglalt állapotban"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav hangok"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Figyelmeztetések"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Nem elérhető"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6740,7 +6645,7 @@ msgstr ""
 "If ticked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6749,7 +6654,7 @@ msgstr ""
 "If ticked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6762,7 +6667,7 @@ msgstr ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6775,40 +6680,40 @@ msgstr ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "perc"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatikus állapot"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Ask status message when I:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Bejelentkezés"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Kijelentkezés"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 #, fuzzy
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
@@ -6817,68 +6722,68 @@ msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Alapértelmezett üzenet"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Állapot üzenet"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Preset Status Messages</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Téma"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Téma"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "A felhasználói felület színének és betűtípusának beállítása"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Állapo _ikonkészlet:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "_Transport ikonok használata"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6888,74 +6793,74 @@ msgstr ""
 "from MSN will have the equivalent MSN icon for status online, away, busy, "
 "etc...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Stílus"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Funkciók"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Hangkimeneti eszköz"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Hangbemeneti eszköz"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Hang teszt"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Videó teszt"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Videó bemeneti eszköz"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "videó kimenet"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Videó képkockasebesség"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Videó mérete"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Kapcsolat"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "STUN szerver:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -6964,52 +6869,62 @@ msgstr ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Hang / Videó"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Kezelés..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Log status changes of contacts"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr ""
 "Ha be van pipálva, akkor a Gajim emlékezni fog a jelszavamra ehhez a fiókhoz"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Vegyes</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Megnyitás..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Bővített Konfiguráció Szerkesztő"
@@ -7194,12 +7109,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Írja be az új jelszót:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Bővített Műveletek"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Egyéni hostnév/port használata"
@@ -7285,7 +7200,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Bejelentkezés"
@@ -7299,7 +7214,7 @@ msgstr "Kérlek készíts egy tiszta új témát a kívánt névvel."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7329,8 +7244,8 @@ msgstr "_Alapértelmezett színek visszaállítása"
 msgid "Resets value to default"
 msgstr "_Alapértelmezett színek visszaállítása"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Hostnév:"
@@ -7373,7 +7288,7 @@ msgstr "Kliens tanusítvány"
 msgid "Proxy Host"
 msgstr "Proxy _Hoszt:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Típus"
 
@@ -7387,8 +7302,7 @@ msgstr "_Protokoll:"
 msgid "Copy info to clipboard"
 msgstr "Link Helyének _Másolása"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Funkciók"
 
@@ -7575,6 +7489,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Állapot üzenet _megváltoztatása"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Hangulat:</b>"
@@ -7653,8 +7572,8 @@ msgstr "Várakozás"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7841,79 +7760,105 @@ msgstr "Regisztráció nem sikerült"
 msgid "_Name"
 msgstr "_Név:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Prox_y:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Beszélgetés kezdeményezése"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Előzménykezelő"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
-msgstr "Beállítások"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Regisztráció nem sikerült"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+msgid "_Preferences"
+msgstr "_Beállítások"
+
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Fiókok"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Nézet"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Csak az _aktív partnereket mutassa"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Mutassa a kijelentkezett partnereket"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Csak az _aktív partnereket mutassa"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Mutassa a transzportokat"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML parancssor"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Fileátvitelek"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Súgó"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Funkciók"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Magamról"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7928,6 +7873,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Csoportos beszélgetések elhagyása"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8217,60 +8167,68 @@ msgstr "Névsor elem cseréje"
 msgid "Create new group chat"
 msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Beállítások"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Fileátvitelek"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "állapotüzenet"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "_XML Parancssor Mutatása"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Beszélgetés kinézete</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Mutassa a kijelentkezett partnereket"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Csak az _aktív partnereket mutassa"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Csak az _aktív partnereket mutassa"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Partnerek"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Személyes információk"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Rename Contact"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Elküldött partnerek:"
@@ -8348,12 +8306,16 @@ msgstr "Töltse ki az ívet."
 msgid "Group Chat Configuration"
 msgstr "Meghívó közös társalgásba"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML parancssor"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "Csevegés _kezdeményezése..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Szűrés:"
@@ -8399,10 +8361,6 @@ msgstr "Összes függő esemény mutatása"
 msgid "Mute Sounds"
 msgstr "Hangok némítása"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-msgid "_Preferences"
-msgstr "_Beállítások"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8723,124 +8681,124 @@ msgstr "File transfer of %(filename)s from %(name)s stopped."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Nincs"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s csatlakozott a közös beszélgetéshez"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Közös beszélgetés üzenet kiemelése"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Közös beszélgetés üzenet kiemelése"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Nincs"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Közös beszélgetés üzenet kiemelése"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Nincs"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "A szolgáltatás nem található"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Nincs"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Meghívó közös társalgásba"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "A munkamenet NEM LESZ naplózva"
@@ -8869,7 +8827,7 @@ msgid "Sender: %s"
 msgstr "Feladó: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Címzett: "
 
@@ -9023,7 +8981,7 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "Nem lehet üres fileokat küldeni"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Feladó: "
 
@@ -9038,7 +8996,7 @@ msgid "Change"
 msgstr "Becenév _megváltoztatása..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Nemsokára vagyok"
@@ -9068,11 +9026,12 @@ msgid "Password Change Failed"
 msgstr "Jelszó szükséges"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Hiba lépett fel a fiók létrehozása közben"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
@@ -9110,40 +9069,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Ismeretlen SSL hiba: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Folytatott beszélgetés"
+msgid "Start / Join Chat"
+msgstr "Beszélgetés kezdeményezése"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Addig nem léphetsz be közös társalgásba amíg csatlakozva vagy."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Ismerős hozzáadása..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s nincs meg"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Ez a szolgáltatás még nem válaszolt a részletezett információkkal"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9152,33 +9106,33 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Egyebek"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Kapcsolat nélkül nem böngészheted az elérhető szolgáltatásokat"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Szolgáltatás felderítés ennek a fióknak a használatával: %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Szolgáltatás felderítés"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "A szolgáltatás nem található"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9186,143 +9140,143 @@ msgstr ""
 "Nincs szolgáltatás azon a címen amit beírtál, vagy a szogáltató nem "
 "válaszol. Ellenőrizd a címet és próbáld újra."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "A szolgáltatás nem böngészhető"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Ez a típusú szolgáltatás nem tartalmaz böngészhető elemeket."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Érvénytelen szervernév"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Tallózás"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Ez a szolgáltatás nem tartalmaz olyan elemet amely böngészhető lenne."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "parancs"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gisztrál"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Keresés"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Szerkesztés"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Scanning %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Felhasználók"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Azonosító"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Feliratkozva"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Csomópont"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Új bejegyzés"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Feliratkozás"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Leiratkozás"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Levél küldése"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "tárgy"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Levél ezzel a fiókkal: %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Levél ebben a fiókban %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Levél"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Elküldött %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Fogadott %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Nem megengedett karakter"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Kapcsolat nem elérhető"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Győződj meg róla, hogy ezzel vagy csatlakozva: \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr ""
 "Nem lehetséges az üzenetküldés neki: %s. Ez a Jabber Azonosító nem érvényes."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s írta:\n"
@@ -9368,94 +9322,75 @@ msgstr "Regisztráció sikeres"
 msgid "Registration failed"
 msgstr "Regisztráció nem sikerült"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Nem érhető el szótár a(z) %s nyelvhez"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Fel kell telepítened a(z) %s szótárat hogy használhasd a helyesírás-"
-"ellenőrzést, vagy válassz egy másik nyelvet a beszélő_nyelv opció "
-"beállításával.\n"
-"\n"
-"A félregépelt szövegek kiemelése funkció nem lesz használva"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "for account %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG szám:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Meghívó közös társalgásba"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Partner meghívott téged egy közös társalgásba %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Megjegyzés: %s"
@@ -9470,6 +9405,11 @@ msgstr "GG szám:"
 msgid "ICQ Number"
 msgstr "ICQ szám:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Ismerős hozzáadása..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9525,7 +9465,7 @@ msgstr "Hiba a szolgáltatás hozzáadása közben. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9687,31 +9627,51 @@ msgstr "A Parner Lekapcsolódott "
 msgid "Contact Connected Background "
 msgstr "Partner csatlakozott"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Állapot üzenet"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Állapot üzenet"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Állapot üzenet"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Állapot üzenet"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Érvénytelen becenév"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Nem megengedett karakter"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Biztosan szeretnéd törölni a kiválasztott üzenetet?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9719,12 +9679,12 @@ msgid ""
 msgstr ""
 "Ez a név már használatban van. Felül szeretnéd írni ezt az állapotüzenetet?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktív"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Regisztráció nem sikerült"
@@ -9748,10 +9708,9 @@ msgid "Error: %s"
 msgstr "Hiba: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Hiba"
 
@@ -9765,48 +9724,48 @@ msgstr "Az állapot mostantól: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Az állapot mostantól: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Új E-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Minden file"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Takarít"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Manage Proxy Profiles"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Prox_y:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "Állapothoz _igazítás"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Kijelentkezett"
@@ -9827,7 +9786,7 @@ msgstr "Fiók sor"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Az új fiók sikeresen elkészült"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9859,60 +9818,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "A \"%s\" fiók csatlakozva van a szerverhez"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Szinkronizálás"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Mit szeretnél csinálni?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Csatlakozás"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Olvasatlan üzenetek továbbítása"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Egy GTK+ Jabber kliens"
@@ -9973,127 +9937,127 @@ msgstr ""
 "Gabriel Papp <gabriel.papp@gmx.com>\n"
 "Göller Bertalan <>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Válaszd ki az elküldendő filet..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Válassz képet"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Minden file"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Minden file"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "_File Küldése"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Képek"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Válassz képet"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Minden file"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "File mentése másként..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, fuzzy, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Csatlakozva"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Lecsatlakozva"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Filenév: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Letöltés"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Feltöltés"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Fileátvitel megállítva"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Szüneteltetve"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Szüneteltetve"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Leírás: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Szüneteltetve"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Szüneteltetve"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Szüneteltetve"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Szüneteltetve"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Szüneteltetve"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Szüneteltetve"
@@ -10102,7 +10066,7 @@ msgstr "Szüneteltetve"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Érvénytelen file"
@@ -10158,26 +10122,26 @@ msgstr "Közös beszélgetés üzenet kiemelése"
 msgid "Group Chat Message Received"
 msgstr "Közös beszélgetési üzenet érkezett"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Jelszó szükséges"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Egyik sem"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Mégse"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10196,11 +10160,6 @@ msgstr "%s fiók használatával"
 msgid "Hide _Contact List"
 msgstr "_Partnerek Meghívása "
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Csak az _aktív partnereket mutassa"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Elrejti ezt a menüt"
@@ -10248,35 +10207,30 @@ msgstr ""
 "Hiba lépett fel a személyes információid közzététele közben. Próbáld meg "
 "később."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Tulajdonságok"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 msgid "Your archiving preferences have successfully been saved."
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Nem csatlakozol a szerverhez"
+msgid "Archiving Preferences Error"
+msgstr "Tulajdonságok"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Hiba a fogadott adatformában"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "Tulajdonságok"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktiválva"
@@ -10325,60 +10279,60 @@ msgstr "Egyik sem"
 msgid "?password:Hidden"
 msgstr "Jelszó:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "Tulajdonságok"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Hang / Videó"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Képesség hogy beszélgetést kezdeményezzünk hanggal és videóval."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Ez a funkció nem elérhető Windowson."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10387,21 +10341,21 @@ msgstr ""
 "Képesség hogy mérje a tétlenül eltöltött időt az automatikus állapotüzenet "
 "beállításához"
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "libxss könyvtár szükséges."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10410,58 +10364,58 @@ msgstr ""
 "Szerver nélküli beszélgetés a helyi hálózaton automatikusan felismert "
 "kliensekkel."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "python-gnome2 szükséges hozzá."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "gpg és python-GnuPGInterface szükséges hozzá."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Kapcsolat"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "libgtkspell szükséges hozzá."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Ez a funkció nem elérhető Windowson."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Figyelmeztetések"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Képesség hogy beszélgetést kezdeményezzünk hanggal és videóval."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "python-dbus szükséges hozzá."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Jelszó megjegyzése"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
@@ -10470,43 +10424,44 @@ msgstr ""
 "A jelszavakat biztonságosan lehet tárolni nem csak egyszerű szöveges "
 "formátumban."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
 msgstr ""
+"gnome-keyring és python-gnome2-desktop, vagy kwalletcli szükséges hozzá."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Helyesírás-ellenőrző"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "libgtkspell szükséges hozzá."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "python-gnome2 szükséges hozzá."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Tulajdonságok"
@@ -10553,7 +10508,7 @@ msgstr "Érvénytelen listanév"
 msgid "You must enter a name to create a privacy list."
 msgstr "Be kell írnod egy nevet hogy magánéleti listát készíthess."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "_Partnerek Meghívása "
@@ -10581,7 +10536,7 @@ msgstr "_Kész"
 msgid "Commands"
 msgstr "parancs"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10656,118 +10611,132 @@ msgstr "Feliratkozási kérelem tőle: %s"
 msgid "Loading"
 msgstr "Programozik"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Csatlakozva"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Hiba lépett fel a fiók létrehozása közben"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "%s fiók törlése"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Kattintson ide a fiók jelszavának megváltoztatásához"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Csatlakozás"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "A szervered nem támogatja a Vcard-ot"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Nem megengedett karakter"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "A szervered nem támogatja a Vcard-ot"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "A \"%s\" fiók csatlakozva van a szerverhez"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Új bejegyzés létrehozása"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Az egyedi portnak egy számnak kell lennie."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Bővített Műveletek"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "%s bannolása"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Ismeretlen SSL hiba: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "%s fiók törlése"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Regisztrálás ide: %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Fiók sor"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Fiók sikeresen hozzáadva"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Fiókok"
@@ -10810,255 +10779,259 @@ msgstr "Keresés"
 msgid "No results found"
 msgstr "Nincs eredmény"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "állapotüzenet címe"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "állapotüzenet szövege"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Újracsatlakozik?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Újracsatlakozik?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Ha azt szeretnéd, hogy a változások azonnal életbelépjenek, akkor újra be "
 "kell jelentkezned."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Kélek ellenőrizd hogy az Avahi, vagy a Bonjour telepítve van-e."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Kélek ellenőrizd hogy az Avahi, vagy a Bonjour telepítve van-e."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Érvénytelen fiók"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "A \"%s\" fiók csatlakozva van a szerverhez"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Minden beszélgető és közös beszélgetőablak be lesz zárva. Szeretnéd "
 "folytatni?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Érvénytelen fiók"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 #, fuzzy
 msgid "Label"
 msgstr "címke"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "_Partnerek Meghívása "
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Kliens tanusítvány"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_satlakozás a Gajim indításával"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Beszé_lgetésnapló mentése az összes partnerhez"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Minden állapot"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Megváltoztatja az állapotát egy fióknak vagy több fióknak"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "File küldő proxy-k használata"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "%s óta tétlen"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "_Partnerek Meghívása "
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignore events from contacts not in the roster"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tás:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "HTTP__PROXY környezeti változójának _használata"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Megváltoztatja az állapotát egy fióknak vagy több fióknak"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Vezetéknév:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Keresztnév:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Új E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Állapothoz _igazítás"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 #, fuzzy
 msgid "Enable"
 msgstr "Engedélyezve"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Kapcsolat"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Kliens tanusítvány"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PKCS12 Fileok"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Jelszó megjegyzése"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Regisztráció nem sikerült"
@@ -11111,19 +11084,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d partner eltávolítva"
 msgstr[1] "%d partner eltávolítva"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Ismeretlen Előadó"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Ismeretlen Cím"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Ismeretlen forrás"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11137,22 +11110,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Könyvjelző"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "A file üres"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Service sent malformed data"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11209,127 +11182,235 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Összes függő esemény mutatása"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Funkciók"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "A fogalmazott üzenetek helyesírás ellenőrzése"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Szolgáltatás felderítés ennek a fióknak a használatával: %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Partnerek"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Csoportos beszélgetések"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Legutóbbi:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Regisztráció nem sikerült"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Folytatott beszélgetés"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Ismeretlen SSL hiba: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Choose interval between 2 checks of idleness."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Nem érhető el szótár a(z) %s nyelvhez"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Fel kell telepítened a(z) %s szótárat hogy használhasd a helyesírás-"
+#~ "ellenőrzést, vagy válassz egy másik nyelvet a beszélő_nyelv opció "
+#~ "beállításával.\n"
+#~ "\n"
+#~ "A félregépelt szövegek kiemelése funkció nem lesz használva"
+
+#~ msgid "_Reconnect"
+#~ msgstr "Újracsatlakozás"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Csak az _aktív partnereket mutassa"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Ismerős hozzáadása..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "_Partnerek Meghívása "
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Csoportos beszélgetések elhagyása"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Új közös beszélgetés"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "If True, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Nem megfelelő karakter van a hosztnévben."
+
+#~ msgid "Server address required."
+#~ msgstr "Szerver cím szükséges."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Nem megfelelő karakter van a felhasználónévben."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Nem megfelelő karakter van az erőforrásban."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Notify me about contacts that sign _in"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Notify me about contacts that sign _out"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Preview new messages in notification popup?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Notify me when a file transfer is complete"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Notify me when a file transfer is complete"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Background colour of contacts when they just signed in."
+
+#~ msgid "Event Type"
+#~ msgstr "Esemény típusa"
+
+#~ msgid "Event desc"
+#~ msgstr "Esemény leírása"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Nem csatlakozol a szerverhez"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Erőforrás összeférhetetlenség"
 
@@ -11985,9 +12066,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "_Send Private Message"
 #~ msgstr "Privát Üzenet _Küldése"
 
-#~ msgid "Send _File"
-#~ msgstr "_File Küldése"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Résztvevők"
@@ -14234,10 +14312,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Telepítés/Frissítés"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Regisztráció nem sikerült"
-
 #~ msgid "cyan"
 #~ msgstr "cián"
 
@@ -14763,9 +14837,6 @@ msgstr "Regisztráció nem sikerült"
 #~ "your setup you can select another one here.\n"
 #~ "You might consider to change possible firewall settings."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Fiókok _egyesítése"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP nem használható ezen a számítógépen"
 
@@ -15313,10 +15384,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "python-gnome2 szükséges hozzá."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr ""
-#~ "gnome-keyring és python-gnome2-desktop, vagy kwalletcli szükséges hozzá."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/it.po b/po/it.po
index 801581786..7c67778fe 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2014-05-12 12:00+0200\n"
 "Last-Translator: Davide Pizzetti <erpizzo@alice.it>\n"
 "Language-Team: Gajim Translators\n"
@@ -22,72 +22,78 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, python-format
+msgid "Account: %s"
+msgstr "Account: %s"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "e autenticata"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "e NON autenticata"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "cifratura %(type)s è attiva %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "Ann_ulla"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Cancella"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "Incolla come citazione"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "Incolla immagine"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr "Stai cercando di incollare un'immagine"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 "Sei sicuro di volere incollare l'immagine nei tuoi appunti nella finestra "
 "della conversazione?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "_Non chiedermelo di nuovo"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "Privacy"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 "Se invii un file a <b>%s</b>, il tuo indirizzo XMPP reale sarà rivelato."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -152,431 +158,425 @@ msgstr "Non c'è nessuna richiesta di sottoscrizione in attesa."
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 msgid "Not in contact list"
 msgstr "Non nella lista dei contatti"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 msgid "I would like to add you to my contact list"
 msgstr "Vorrei aggiungerti alla lista dei miei contatti."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Invia un _messaggio singolo…"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "_Esegui il comando…"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Gestisci il trasporto"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Modifica il trasporto"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "_Rinomina…"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Sblocca"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blocca"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Elimina"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informazioni"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Invia un file…"
+#: gajim/gui_menu_builder.py:517
+msgid "Send File"
+msgstr "Invia File"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
 msgstr "Carica un file…"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr "Invia un file direttamente…"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 msgid "Send Chatstate"
 msgstr "Invia lo stato della chat"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
-msgstr "Invita contatti"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+msgid "Invite Contacts…"
+msgstr "Invita Contatti"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
-msgid "Add to Contact List"
-msgstr "Aggiungi alla lista dei contatti"
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
+msgid "Add to Contact List…"
+msgstr "Aggiungi alla lista contatti…"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 msgid "Voice Chat"
 msgstr "Chat vocale"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 msgid "Video Chat"
 msgstr "Conversazione video"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "Informazioni"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "Cronologia"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
-msgstr "Solo scrittura"
-
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Tutti gli stati"
+#: gajim/gui_menu_builder.py:534
+msgid "Composing Only"
+msgstr "Solo Composizione Messaggio"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Invita contatti"
+#: gajim/gui_menu_builder.py:535
+msgid "All Chat States"
+msgstr "Tutti gli Stati"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 msgid "Manage Group Chat"
 msgstr "Gestisci la conversazione di gruppo"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
-msgid "Rename Group Chat"
-msgstr "Rinomina la conversazione di gruppo"
-
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
-msgstr "Cambia il soggetto"
+#: gajim/gui_menu_builder.py:575
+msgid "Rename…"
+msgstr "Rinomina…"
 
-#: gajim/gui_menu_builder.py:579
-msgid "Configure Group Chat"
-msgstr "Configura la conversazione di gruppo"
+#: gajim/gui_menu_builder.py:576
+msgid "Change Subject…"
+msgstr "Cambia l'Argomento"
 
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "Carica un avatar…"
 
-#: gajim/gui_menu_builder.py:581
-msgid "Destroy Group Chat"
-msgstr "Distruggi la conversazione di gruppo"
+#: gajim/gui_menu_builder.py:578
+msgid "Configure…"
+msgstr "Configura…"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+msgid "Destroy…"
+msgstr "Destruggi…"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 msgid "Chat Settings"
 msgstr "Impostazioni della chat"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+#, fuzzy
+msgid "Show Join/Leave"
 msgstr "Mostra chi si unisce / se ne va"
 
-#: gajim/gui_menu_builder.py:585
-msgid "Show status changes"
-msgstr "Mostra i cambiamenti di stato"
+#: gajim/gui_menu_builder.py:583
+msgid "Show Status Changes"
+msgstr "Mostra Cambi di Stato"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
-msgstr "Notifica per tutti i messaggi"
+#: gajim/gui_menu_builder.py:584
+msgid "Notify on all Messages"
+msgstr "Notifica Tutti i Messaggi"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
-msgstr "Minimizza alla chiusura"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
+msgstr "Minimizza alla Chiusura"
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
-msgstr "Minimizza all'entrata automatica"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
+msgstr "Minimizza quando ti Unisci Automaticamente"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "Sincronizza il valore di soglia"
 
-#: gajim/gui_menu_builder.py:593
-msgid "Change Nickname"
-msgstr "Cambia il soprannome"
+#: gajim/gui_menu_builder.py:591
+msgid "Change Nickname…"
+msgstr "Cambia Soprannome…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "Richiedi voce"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "Esegui comando"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+msgid "Execute Command…"
+msgstr "Esegui Comando…"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr "Abbandona"
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "Nessun valore di soglia"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i giorno fa"
 msgstr[1] "%i giorni fa"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Solo scrittura"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Tutti gli stati"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
 msgstr "Aggiungi un contatto…"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Profilo"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "Invia un messaggio singolo…"
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
-msgstr "Ricerca servizi"
+#: gajim/gui_menu_builder.py:674
+msgid "Discover Services…"
+msgstr "Ricerca Servizi…"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "Informazioni sul server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "Archiviazione preferenze"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 msgid "Blocking List"
 msgstr "Elenco degli utenti bloccati"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 msgid "PEP Configuration"
 msgstr "Configurazione PEP"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
-msgstr "Sincronizza cronologia"
+#: gajim/gui_menu_builder.py:681
+msgid "Synchronise History…"
+msgstr "Sincronizza Cronologia…"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Elenchi della privacy"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
 msgstr "Amministratore"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 msgid "Send Server Message…"
 msgstr "Invia un messaggio del server..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 msgid "Set MOTD…"
 msgstr "Imposta il messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr "Aggiorna il messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 msgid "Delete MOTD…"
 msgstr "Elimina messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 msgid "_Add Account…"
 msgstr "_Aggiungi un account…"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 msgid "_Modify Accounts…"
 msgstr "_Modifica gli account…"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 msgid "_Modify Account…"
 msgstr "_Modifica l'account…"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Account"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 msgid "Copy XMPP Address"
 msgstr "Copia l'indirizzo XMPP"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
 msgstr "Unisciti ad una conversazione di gruppo"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Inizia una conversazione"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-msgid "Add to Contact List…"
-msgstr "Aggiungi alla lista contatti…"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
 msgstr "Copia l'indirizzo del collegamento"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 msgid "Open Link in Browser"
 msgstr "Apri il collegamento nel browser"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
 msgstr "Copia l'indirizzo e-mail"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 msgid "Open Email Composer"
 msgstr "Apri il compositore delle e-mail"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 msgid "Copy Location"
 msgstr "Copia la posizione"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 msgid "Show Location"
 msgstr "Mostra la posizione"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 msgid "Copy XMPP Address/Email"
 msgstr "Copia l'indirizzo XMPP/E-mail"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 msgid "Invite"
 msgstr "Invita"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr "Blocca"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 msgid "Kick"
 msgstr "Caccia"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 msgid "Ban"
 msgstr "Bandisci"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 msgid "Make Owner"
 msgstr "Rendi proprietario"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 msgid "Make Admin"
 msgstr "Rendi amministratore"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 msgid "Make Member"
 msgstr "Rendi membro"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
-msgstr "Membro"
+msgstr "Rifiuta Membro"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
-#, fuzzy
+#: gajim/gui_menu_builder.py:941
 msgid "Revoke Voice"
-msgstr "Richiedi voce"
+msgstr "Rifiuta Richiesta di Parola"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 msgid "Copy"
 msgstr "Copia"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Uso:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Opzioni:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Mostra questo messaggio di aiuto ed esci"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Scegli cartella per il logfile"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare il database delle cronologie"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "%s non esiste."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 msgid "XMPP Address"
 msgstr "Indirizzo XMPP"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -584,27 +584,27 @@ msgstr "Data"
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Messaggio"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Soggetto"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Pulizia del database"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 msgid "Clean up the database?"
 msgstr "Pulire il database?"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
@@ -615,167 +615,161 @@ msgstr ""
 "diventerà riutilizzabile e basta. Questa operazione può impiegare un po' di "
 "tempo."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 msgid "_Cleanup"
 msgstr "_Pulisci"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Tu"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s alle %(time)s ha detto: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Elimina"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Elimina conversazione"
 msgstr[1] "Elimina conversazioni"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Vuoi eliminare permanentemente questa conversazione con <b>%s</b>?"
 msgstr[1] "Vuoi eliminare permanentemente queste conversazioni?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Elimina il messaggio"
 msgstr[1] "Elimina i messaggi"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Vuoi eliminare permanentemente questo messaggio?"
 msgstr[1] "Vuoi eliminare permanentemente questi messaggi?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome del contatto: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr "Indirizzo XMPP: <i>%s</i>"
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Generale"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Gruppo"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Imposta uno stato d'animo"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Nessuno"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Sovrascrivere il messaggio di stato?"
 
-#: gajim/dialogs.py:702
-#, fuzzy
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
-msgstr ""
-"Questo nome è già stato utilizzato. Vuoi sovrascrivere questo messaggio di "
-"stato?"
+msgstr "Questo nome è già utilizzato. Sovrascriverlo?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr "_Sovrascrivi"
 
-#: gajim/dialogs.py:718
-#, fuzzy
+#: gajim/dialogs.py:716
 msgid "Status Preset"
-msgstr "Messaggio di stato"
+msgstr "Stato Personalizzato"
 
-#: gajim/dialogs.py:719
-#, fuzzy
+#: gajim/dialogs.py:717
 msgid "Save status as preset"
-msgstr "Salva come predefinito..."
+msgstr "Salva come Stato Personalizzato"
 
-#: gajim/dialogs.py:720
-#, fuzzy
+#: gajim/dialogs.py:718
 msgid "Please assign a name to this status message preset"
-msgstr "Per piacere, inserisci un nome per questo messaggio di stato"
+msgstr "Assegnare un nome allo stato personalizzato"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 msgid "_Save"
 msgstr "_Salva"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 msgid "New Status"
 msgstr "Nuovo stato"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Non sei connesso al server"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non puoi sincronizzarti con un account a meno che non sia connesso."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Sincronizza"
 
@@ -783,7 +777,7 @@ msgstr "Sincronizza"
 # %(contact)s wants to start %(type)s session with you. Do you want to answer the call?
 # Look at the translation of this string to better understand.
 # In italian translation, i just put "audio-video" because it will result in "iniziare una sessione audio-video".
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "audio-video"
 
@@ -791,7 +785,7 @@ msgstr "audio-video"
 # %(contact)s wants to start %(type)s session with you. Do you want to answer the call?
 # Look at the translation of this string to better understand.
 # In italian translation, i just put "audio" because it will result in "iniziare una sessione audio".
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "audio"
 
@@ -799,100 +793,102 @@ msgstr "audio"
 # %(contact)s wants to start %(type)s session with you. Do you want to answer the call?
 # Look at the translation of this string to better understand.
 # In italian translation, i just put "video" because it will result in "iniziare una sessione video".
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "video"
 
 # in italian translation, %(type)s will be one of: audio, video, audio-video.
-#: gajim/dialogs.py:1050
-#, fuzzy, python-format
+#: gajim/dialogs.py:1051
+#, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
-"%(contact)s vuole iniziare una sessione %(type)s con te. Vuoi rispondere "
-"alla chiamata?"
+"%(contact)s vuole iniziare una conversazione %(type)s. Vuoi rispondere?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Invia un file…"
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Invia un file (massimo %s MiB)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 msgid "No File Transfer available"
 msgstr "Nessun trasferimento di file disponibile"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 msgid "Invalid XMPP Address"
 msgstr "Indirizzo XMPP non valido"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Non è stato possibile caricare l'immagine"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, python-format
 msgid "Kick %s"
 msgstr "Caccia %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr "Banna %s"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Inserisci il soprannome"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 msgid "Voice Request"
 msgstr "Richiesta di conversazione vocale"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
-msgstr "<b>%s</b> da <b>%s</b> richiede una conversazione vocale"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
+msgstr "<b>%(nick)s</b> da <b>%(room_name)s</b> ha chiesto la parola"
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr "_Approva"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s ha impostato l'argomento a %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr "La conversazione di gruppo ora mostra i membri non disponibili"
 
-#: gajim/groupchat_control.py:1076
-#, fuzzy
+#: gajim/groupchat_control.py:1077
 msgid "Group chat now does not show unavailable members"
-msgstr "La stanza ora non mostra i membri non disponibili"
+msgstr "La stanza mostra solo i membri disponibili"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr "Un'impostazione non relativa alla privacy è stata cambiata"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 msgid "Conversations are stored on the server"
 msgstr "Le conversazioni sono conservate nel server"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 msgid "Conversations are not stored on the server"
 msgstr "Le conversazioni non sono conservate nel server"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 msgid "Group chat is now non-anonymous"
 msgstr "La conversazione di gruppo è ora non anonima"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 msgid "Group chat is now semi-anonymous"
 msgstr "La conversazione di gruppo ora è semi-anonima"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 msgid "Group chat is now fully anonymous"
 msgstr "La conversazione di gruppo ora è completamente anonima"
 
@@ -906,7 +902,7 @@ msgstr "Ping? (%s)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Errore."
 
@@ -931,26 +927,25 @@ msgid "A new group chat has been created"
 msgstr "È stata creata una nuova conversazione di gruppo"
 
 #: gajim/groupchat_control.py:1265
-#, fuzzy
 msgid "Failed to Configure Group Chat"
-msgstr "Configura la conversazione di gruppo"
+msgstr "Impossibile configurare la stanza"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ora sei conosciuto come %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} è ora conosciuto come {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Ora sei {show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} è ora {show}{status}"
@@ -1008,9 +1003,8 @@ msgid ": Affiliation changed"
 msgstr ": Affiliazione cambiata"
 
 #: gajim/groupchat_control.py:1417 gajim/groupchat_control.py:1481
-#, fuzzy
 msgid ": Group chat configuration changed to members-only"
-msgstr "la stanza è ora accessibile solo ai membri"
+msgstr ": Stanza disponibile solo ai membri"
 
 #: gajim/groupchat_control.py:1445
 #, python-brace-format
@@ -1043,23 +1037,21 @@ msgid "%s has joined the group chat"
 msgstr "%s si è unito alla conversazione di gruppo"
 
 #: gajim/groupchat_control.py:1520
-#, fuzzy
 msgid "Failed to Join Group Chat"
-msgstr "Non si è in grado di unirsi alla conversazione di gruppo"
+msgstr "Impossibile unirsi alla stanza"
 
 #: gajim/groupchat_control.py:1526
-#, fuzzy
 msgid "Failed to Create Group Chat"
-msgstr "Crea una conversazione di gruppo"
+msgstr "Impossibile creare la stanza"
 
 #: gajim/groupchat_control.py:1542
 msgid "Group chat has been destroyed"
 msgstr "La conversazione di gruppo è stata distrutta"
 
 #: gajim/groupchat_control.py:1547
-#, fuzzy, python-format
+#, python-format
 msgid "You can join this group chat instead: xmpp:%s?join"
-msgstr "Puoi invece entrare in questa stanza: xmpp:%s?join"
+msgstr "Invece potresti unirti a questa stanza: xmpp:%s?join"
 
 #: gajim/groupchat_control.py:1732
 msgid "Leave Group Chat"
@@ -1074,53 +1066,53 @@ msgstr "Sei sicuro di volere lasciare questa conversazione di gruppo?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Se chiudi questa finestra, lascerai '%s'."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr "_Abbandona"
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s è stato invitato in questa conversazione di gruppo"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Mostra un elenco di formattazioni"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Questo contatto non supporta HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s secondi)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s stato : %(state)s, motivo : %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s dalla conversazione di gruppo %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 "Nota: la cronologia delle conversazioni è disabilitata per questo contatto."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 "Nota: la cronologia delle conversazioni è disabilitata per questo account."
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, python-format
 msgid ""
 "You just received a new message from %s.\n"
@@ -1129,26 +1121,26 @@ msgstr ""
 "Hai appena ricevuto un nuovo messaggio da %s.\n"
 "Vuoi chiudere questa scheda?"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 msgid "Close"
 msgstr "Chiudi"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1157,172 +1149,162 @@ msgstr ""
 "Oggetto: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s ora è %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "Trasferimento di file"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Dimensione"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 msgid "_Accept"
 msgstr "_Accetta"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "_Rifiuta"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Trasferimento del file completato"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 msgid "Open _Folder"
 msgstr "Apri la _cartella"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 msgid "Group Chat Invitation"
 msgstr "Invito in una conversazione di gruppo"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Il contatto remoto ha interrotto il trasferimento"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Errore nell'apertura del file"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Trasferimento del file interrotto"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Trasferimento del file annullato"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "La connessione con il contatto non può essere stabilita."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr "Mostra la versione dell'applicazione"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "Mostra solo gli errori critici"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
-#, fuzzy
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
-msgstr "Stampa xml stanza e altre informazioni di debug"
+msgstr "Stampa XML stanza e altre informazioni di debug"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Usa il profilo definito nella cartella di configurazione"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Imposta la cartella di configurazione"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Configura il sistema di registrazione degli eventi"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "Mostra tutti gli avvertimenti"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "Apri shell IPython"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Apre una finestra con il prossimo evento in attesa"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Inizia una conversazione"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "Simula perdita di connettività"
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "Simula il recupero di connettività"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Errore del database"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Trasporti"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 msgid "Group chats"
 msgstr "Conversazioni di gruppo"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr "Autorizzazione inviata"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "\"%s\" ora vedrà il tuo stato."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "La richiesta di iscrizione è stata inviata"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Se \"%s\" accetta questa richiesta, conoscerai il suo stato."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
 msgstr "Autorizzazione rimossa"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come non in linea."
@@ -1331,7 +1313,7 @@ msgstr "Ora \"%s\" ti vedrà sempre come non in linea."
 msgid "desynced"
 msgstr "desincronizzato"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr "Esci da Gajim"
 
@@ -1348,7 +1330,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Esci _sempre quando chiudi Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Esci"
 
@@ -1377,13 +1360,13 @@ msgid "You still have unread messages"
 msgstr "Hai ancora dei messaggi non letti"
 
 #: gajim/roster_window.py:2473
-#, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
 "history is enabled and if the contact is in your contact list."
 msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
-"cronologia è abilitata e il contatto è nell'elenco dei tuoi contatti."
+"cronologia è abilitata e se il contatto è presente nell'elenco dei tuoi "
+"contatti."
 
 #: gajim/roster_window.py:2733
 msgid "You have unread messages"
@@ -1436,13 +1419,12 @@ msgid "Really block this contact?"
 msgstr "Bloccare davvero questo contatto?"
 
 #: gajim/roster_window.py:2822
-#, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 "Questo contatto ti vedrà non in linea e non riceverai i messaggi che ti "
-"manderà."
+"invierà."
 
 #: gajim/roster_window.py:2824
 msgid "_Block Contact"
@@ -1457,13 +1439,12 @@ msgid "Really block this group?"
 msgstr "Bloccare davvero questo gruppo?"
 
 #: gajim/roster_window.py:2828
-#, fuzzy
 msgid ""
 "All contacts of this group will see you as offline and you will not receive "
 "any messages sent to you by any one of these contacts."
 msgstr ""
-"Questo contatto ti vedrà non in linea e non riceverai i messaggi che ti "
-"manderà."
+"I contatti di questo gruppo ti vedranno non in linea e non riceverai i "
+"messaggi che ti invieranno."
 
 #: gajim/roster_window.py:2831
 msgid "_Block Group"
@@ -1495,8 +1476,8 @@ msgstr "Rinominare il gruppo %s?"
 msgid "Please enter a new name"
 msgstr "Per piacere, inserisci un nuovo nome"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 msgid "_Rename"
 msgstr "_rinomina"
 
@@ -1510,29 +1491,32 @@ msgid "Do you want to remove %s from the contact list?"
 msgstr "Vuoi rimuovere %s dalla tua lista dei contatti?"
 
 #: gajim/roster_window.py:2951
-#, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
-msgstr "Rimuovi anche tutti i contatti di questo gruppo dal tuo elenco"
+msgstr "Rimuovi dall'elenco dei contatti anche tutti quelli di questo gruppo"
+
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+msgid "Rename Group Chat"
+msgstr "Rinomina la conversazione di gruppo"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3045
 msgid "Please enter a new name for this group chat"
 msgstr ""
 "Per piacere, inserisci un nuovo nome per questa conversazione di gruppo"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 msgid "Remove Contact"
 msgstr "Rimuovi il contatto"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 msgid "Remove contact from contact list"
 msgstr "Rimuovi il contatto dalla tua lista dei contatti"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Stai per rimuovere %(name)s (%(jid)s) dal tuo elenco dei contatti.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1541,19 +1525,19 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione, di "
 "conseguenza ti vedrà sempre non in linea."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Vuoi continuare?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr "_Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 msgid "Remove contacts from contact list"
 msgstr "Rimuovi i contatti dalla lista"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1566,24 +1550,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 msgid "Remove Contacts"
 msgstr "Rimuovi i contatti"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "È necessario creare un account prima di poter conversare con altri contatti."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1591,132 +1575,131 @@ msgstr ""
 "Il tuo server non supporta il salvataggio di informazioni dei metacontatti. "
 "Perciò queste informazioni non saranno salvate alla prossima riconnessione."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
 msgstr "Stai per creare un metacontatto"
 
-#: gajim/roster_window.py:4063
-#, fuzzy
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
-"I metacontatti sono un modo di raggruppare alcuni contatti in una riga. "
-"Generalmente si usano quando la stessa persona ha più account XMPP o su vari "
-"transport."
+"I metacontatti sono un modo per raggruppare più contatti in uno. "
+"Generalmente si usano quando una stessa persona ha più account XMPP o su "
+"vari Transport."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 msgid "Create Metacontact"
 msgstr "Crea il metacontatto"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr "_Crea"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "File URI non valido:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Invia questo file a %s:\n"
 msgstr[1] "Invia questi file a %s:\n"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Invia"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Invia %(from)s a %(to)s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "Rendi %s il primo contatto"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Rendi %(contact1)s e %(contact2)s metacontatti"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Cambia il messaggio di stato"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Pubblica il brano musicale"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Pubblica la posizione"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Invia un m_essaggio di gruppo"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "A tutti gli utenti in linea"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vita a"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Gestisci i contatti"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "Modifica i _gruppi…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 msgid "Re_name"
 msgstr "Ri_nomina"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Riconnetti"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "Esegui comando"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Cronologia"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Gestore della cronologia"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Osservatori"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1837,210 +1820,209 @@ msgstr "Conversazioni private"
 msgid "Messages"
 msgstr "Messaggi"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorizzazione HTTP (%(method)s) per %(url)s (ID: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Accetti questa richiesta?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Accetti questa richiesta (account %s)?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 msgid "Authorization Request"
 msgstr "Richiesta di autorizzazione"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 msgid "HTTP Authorization Request"
 msgstr "Richiesta di autorizzazione HTTP"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 msgid "_No"
 msgstr "_No"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio del %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Richiesta di iscrizione"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 msgid "Subscription Removed"
 msgstr "Sottoscrizione rimossa"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, python-format
-msgid "%s (%s) has removed subscription from you"
-msgstr "%s (%s) ha eliminato l'iscrizione a te"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
+msgstr "%(name)s (%(jid)s) non è più iscritto a te"
 
-#: gajim/gui_interface.py:355
-#, fuzzy
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
-"Li vedrai sempre come non in linea.\n"
-"Vuoi rimuoverli dall'elenco dei tuoi contatti?"
+"Li vedrai sempre non in linea.\n"
+"Rimuoverli dall'elenco contatti?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Non abbonato"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s ha rifiutato l'invito: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s ha rifiutato l'invito"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Sei stato invitato nella stanza {room} da {user}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "Richiesta la frase di accesso per il certificato"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Inserisci la frase di accesso del certificato per l'account %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "È richiesta una password"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Memorizza la password"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Errore durante il trasferimento del file"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento di file"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 msgid "Remote Contact Stopped Transfer"
 msgstr "Il contatto remoto ha interrotto il trasferimento"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 msgid "Error Opening File"
 msgstr "Errore durante l'apertura del file"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 msgid "SSL Certificate Error"
 msgstr "Errore del certificato SSL"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Trasferimento del file interrotto"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Trasferimento del file fallito"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s ricevuto da %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Trasferimento del file %(filename)s da %(name)s interrotto."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Trasferimento del file %(filename)s da %(name)s fallito."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Invio di %(filename)s a %(name)s effettuato con successo."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento del file %(filename)s a %(name)s interrotto."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Trasferimento del file %(filename)s a %(name)s fallito."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Conflitto tra nomi utente"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 msgid "Please enter a new username for your local account"
 msgstr "Per piacere, inserisci un nuovo nome utente per il tuo account locale"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vuole iniziare una conversazione vocale."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Richiesta di conversazione vocale"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 msgid "Insecure Connection"
 msgstr "Connessione non sicura"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2052,36 +2034,36 @@ msgstr ""
 "conversazioni non saranno cifrate. Questo metodo di connessione è fortemente "
 "scoraggiato."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr "_Interrompi"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 msgid "_Connect Anyway"
 msgstr "_Connetti in ogni caso"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr "Gajim: Console IPython"
 
 #: gajim/dialog_messages.py:37
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "It is not possible to send a message to %s. This XMPP Address is not valid."
-msgstr "Impossibile inviare un messaggio a %s, questo JID non è valido."
+msgstr ""
+"Impossibile inviare un messaggio a %s. Questo indirizzo XMPP non è valido."
 
 #: gajim/dialog_messages.py:42
 msgid "Unread Events"
 msgstr "Eventi non letti"
 
 #: gajim/dialog_messages.py:43
-#, fuzzy
 msgid "Read or acknowledge all pending events before removing this account."
-msgstr "Leggi tutti gli eventi in attesa prima di rimuovere questo account."
+msgstr "Prima di rimuovere questo account leggi tutti gli eventi in sospeso."
 
 #: gajim/dialog_messages.py:48
 msgid "Invalid Form"
@@ -2104,11 +2086,10 @@ msgid "XMPP Address Already in List"
 msgstr "Indirizzo XMPP già in lista"
 
 #: gajim/dialog_messages.py:59
-#, fuzzy
 msgid ""
 "The XMPP Address you entered is already in the list. Please choose another "
 "one."
-msgstr "Il Jabber ID inserito è già nella lista. Scegline un altro."
+msgstr "L'indirizzo XMPP è già nella lista. Scegline un altro."
 
 #: gajim/dialog_messages.py:64
 msgid "Invalid Answer"
@@ -2254,11 +2235,11 @@ msgstr "Non c'è alcun metodo di cifratura disponibile per la cifratura scelta."
 msgid "Avatar Upload Failed"
 msgstr "Fallito l'upload dell'avatar"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Invio di un messaggio privato fallito"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2591,80 +2572,74 @@ msgstr ""
 "Il parametro \"%(arg)s\" non è specificato. \n"
 "Scrivere \"%(basename)s help %(command)s\" per maggiori informazioni"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s è una cartella ma dovrebbe essere un file"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, python-format
 msgid "Creating %s"
 msgstr "Creazione di %s in corso"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Errore SSL sconosciuto: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Nuovo messaggio da %(nickname)s"
 msgstr[1] "%(n_msgs)i messaggi non letti da %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 msgid "New Group Chat Message"
 msgstr "Nuovo messaggio della conversazione di gruppo"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ha cambiato stato"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Il contatto ha cambiato stato"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s si è connesso"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s si è disconnesso"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
-#, fuzzy
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 msgid "Authentication failed"
-msgstr "Autenticazione con \"%s\" fallita"
+msgstr "Autenticazione fallita"
 
 #: gajim/common/config.py:76
 #, fuzzy
@@ -2739,61 +2714,20 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Mostra una notifica per i contatti che si _connettono"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Mostra una notifica per i contatti che si _disconnettono"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Colore della notifica di un nuovo messaggio/email."
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Notifica quando un trasferimento file viene completato"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Notifica quando un trasferimento file viene completato"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr "Colore della notifica per gli inviti alle conversazioni di gruppo."
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr "Colore di sfondo delle notifiche per i cambi di stato."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr "Colore delle notifiche per gli altri dialoghi."
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "Elenco (separato da spazi) di linee (account e gruppi) raggruppate."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "predefinito"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr "Lingua utilizzata per il controllo ortografico."
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2803,15 +2737,15 @@ msgstr ""
 "'a volte' - scrive l'ora ogni print_ichat_every_foo_minutes minuti.\n"
 "'mai' - non scrive mai l'ora."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratta le coppie di * / _ come possibili caratteri di formattazione."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2820,7 +2754,7 @@ msgstr ""
 "Se Vero, non verranno rimossi */_ . Perciò *abc* verrà mostrato in grassetto "
 "ma senza rimuovere * *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2829,7 +2763,7 @@ msgstr ""
 "Carattere da aggiungere dopo il soprannome quando si usa il completamento "
 "automatico dei soprannomi (tab) nella conversazione di gruppo."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2839,7 +2773,7 @@ msgstr ""
 "soprannome desiderato è già usato da qualcun'altro nella conversazione di "
 "gruppo"
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 #, fuzzy
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
@@ -2848,11 +2782,11 @@ msgstr ""
 "Se Vero, Gajim salverà la posizione dell'elenco dei tuoi contatti prima di "
 "nasconderlo, e lo ripristinerà quando l'elenco verrà mostrato di nuovo."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2865,24 +2799,24 @@ msgstr ""
 "la documentazione della funzione python strftime per ottenere documentazione "
 "completa: http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Caratteri scritti prima del soprannome nelle conversazioni"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Caratteri scritti dopo il soprannome nelle conversazioni"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Se marcato, Gajim mostrerà lo stato d'animo dei contatti nella finestra dei "
 "tuoi contatti"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -2891,12 +2825,12 @@ msgstr ""
 "Quante linee dalla precedente conversazione ricordare quando una scheda/"
 "finestra di conversazione viene riaperta?"
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -2906,19 +2840,19 @@ msgstr ""
 "conversazione dalla quale sei stato disconnesso. Impostare a 0 per "
 "disabilitare il rientro automatico."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
 "(comportamento predefinito del client ICQ Mirabilis)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Quante linee memorizzare per Ctrl+FrecciaSù."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -2927,12 +2861,12 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -2941,16 +2875,16 @@ msgstr ""
 "Quando non scrivi la data ad ogni messaggio (print_time==sometimes), "
 "scriverla ogni x minuti."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr "Chiedi prima di incollare un'immagine."
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Chiedere prima di chiudere una finestra/scheda di conversazione di gruppo."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -2960,7 +2894,7 @@ msgstr ""
 "rischio di perdere dati (conversazioni, conversazioni private, conversazioni "
 "di gruppo che non saranno minimizzate)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -2970,31 +2904,31 @@ msgstr ""
 "interfacce locali, per il trasferimento file in caso di traslazione "
 "dell'indirizzo/inoltro porte."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Secondo lo standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Notifica gli eventi nell'area di notifica."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare la scheda quando c'è una sola conversazione?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrare il bordo per le schede quando c'è una sola conversazione?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3003,7 +2937,7 @@ msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "conversazioni multi-utente."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3014,21 +2948,13 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Se abilitato, Gajim mostrerà un'icona su ogni scheda contenente dei messaggi "
-"non letti. A seconda del tema, questa icona può essere animata."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3037,7 +2963,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra dei tuoi contatti"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
@@ -3045,7 +2971,7 @@ msgstr ""
 "Definisce la posizione dell'avatar nell'elenco dei tuoi contatti. Può essere "
 "sinistra o destra"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3054,26 +2980,26 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle conversazioni quando un "
 "contatto cambia stato o messaggio di stato."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Non è possibile entrare nella stanza"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Non è possibile entrare nella stanza"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Non mostrare l'account nella taskbar del sistema."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3083,7 +3009,7 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3105,7 +3031,7 @@ msgstr ""
 "'pertype' - Ogni tipo di messaggi (es., conversazioni e conversazioni di "
 "gruppo) viene inviato ad una specifica finestra."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3118,34 +3044,34 @@ msgstr ""
 "'mai' - Non mostrare mai l'elenco dei tuoi contatti.\n"
 "'ultimo_stato' - Ripristina l'elenco dei tuoi contatti dell'ultimo stato."
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Se Falso, l'avatar non sarà più visibile nella finestra della conversazione."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Nasconde il banner in una finestra di conversazione di gruppo"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Nasconde il banner in una finestra di chat 1:1"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr ""
 "Nasconde la lista dei presenti nella stanza nella finestra di conversazione "
 "di gruppo."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3154,11 +3080,11 @@ msgstr ""
 "In una conversazione, mostra il soprannome all'inizio della riga solo quando "
 "non è quello della persona che parlava nel messaggio precedente."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentazione quando si raggruppano soprannomi consecutivi."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3166,7 +3092,7 @@ msgid ""
 msgstr ""
 "Ctrl-Tab va alla prossima scheda di composizione se nessuna è non letta."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3175,7 +3101,7 @@ msgstr ""
 "Mostrare la richiesta di conferma per il blocco di un contatto o meno? Una "
 "stringa vuota significa che non verrà mai mostrata."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3184,7 +3110,7 @@ msgstr ""
 "Mostrare la richiesta di conferma per il blocco di un contatto o meno? Una "
 "stringa vuota significa che non verrà mai mostrata."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3195,7 +3121,7 @@ msgstr ""
 "di modifica account. ATTENZIONE, quando si è collegati con priorità "
 "negativa, NON si riceveranno messaggi dal server."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3204,7 +3130,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il numero di account in linea e totali nelle linee "
 "degli account e dei gruppi."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3213,13 +3139,13 @@ msgstr ""
 "Se Vero, Gajim scorrerà e selezionerà il contatto che ti ha mandato l'ultimo "
 "messaggio, se la finestra di conversazione non è già aperta."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Tempo di inattività richiesto prima che la finestra di cambiamento del "
 "messaggio di stato si chiuda."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3227,11 +3153,7 @@ msgstr ""
 "Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
 "più vecchie verranno cancellate."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Selezione l'intervallo tra 2 controlli di inattività."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3240,7 +3162,7 @@ msgstr ""
 "Schemi uri validi. Solo gli schemi in questo elenco saranno accettati come "
 "uri \"reali\". (mailto e xmpp sono gestiti separatamente)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3248,24 +3170,24 @@ msgstr ""
 "Se Vero, il completamento nelle conversazioni di gruppo funzionerà come un "
 "auto-completamento di shell."
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Opzionalmente correggere il framerate dell'output video di jingle. Esempio: "
 "10/1 o 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Opzionalmente ridimensionare l'output video di jingle. Esempio: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3274,12 +3196,12 @@ msgstr ""
 "Se Vero, Gajim proverà ad usare un server STUN quando si usa jingle. Quello "
 "nell'opzione \"stun_server\", o quello fornito dal server jabber."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "Server STUN da usare quando si usa jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3288,7 +3210,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà l'affilizione dei partecipanti della conversazione "
 "di gruppo aggiungendo un quadratino colorato all'icona di stato"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
@@ -3297,13 +3219,13 @@ msgstr ""
 "Proxy usato per tutte le connessioni in uscita se l'account non ha uno "
 "specifico proxy configurato"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 #, fuzzy
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 "Se Vero, Gajim ignorerà le richieste di attenzione in arrivo (\"wizz\")."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3311,7 +3233,7 @@ msgstr ""
 "Se abilitato, Gajim riaprirà le finestre di conversazione che erano aperte "
 "quando è stato chiuso l'ultima volta."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3320,11 +3242,7 @@ msgstr ""
 "Se abilitato, Gajim mostrerà un'icona per indicare che il messaggio inviato "
 "è stato ricevuto dal contatto"
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3332,37 +3250,37 @@ msgstr ""
 "Se Vero, Gajim userà Gnome-Keyring (se disponibile) per memorizzare le "
 "password degli account."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Se abilitato, Gajim eseguirà dei comandi XEP-0146."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: Sistema, 1: Abilitato, 0: Disabilitato"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3370,7 +3288,7 @@ msgid ""
 msgstr ""
 "Se marcato, Gajim permetterà agli altri di conoscere l'ora del tuo sistema"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3378,7 +3296,7 @@ msgid ""
 msgstr ""
 "Se marcato, Gajim permetterà agli altri di conoscere l'ora del tuo sistema"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3386,7 +3304,7 @@ msgid ""
 msgstr ""
 "Se marcato, Gajim permetterà agli altri di conoscere l'ora del tuo sistema"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3394,7 +3312,7 @@ msgid ""
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3402,30 +3320,34 @@ msgid ""
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr "Preferenze API. Valori possibili: 'http', 'iq'"
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr "Selezionare del testo lo copierà negli appunti"
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 "Se abilitato, Gajim eseguirà dei comandi (/show, /sh, /execute, /exec)."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 "Larghezza in pixel dell'elenco dei contatti nella conversazione di gruppo"
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Aggiungi stanza ai segnalibri"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3434,7 +3356,7 @@ msgstr ""
 "La priorità cambierà automaticamente rispetto al tuo stato. Le priorità sono "
 "definite nelle opzioni autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3445,12 +3367,12 @@ msgstr ""
 "xa, dnd, invisible. NOTA: questa opzione è usata solo se restore_last_status "
 "è disabilitata"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Se abilitato, ripristina l'ultimo stato usato."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
@@ -3458,7 +3380,7 @@ msgstr ""
 "Se Vero, i contatti che richiedono l'autorizzazione saranno automaticamente "
 "accettati."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3467,12 +3389,12 @@ msgstr ""
 "Se Falso, questo account sarà disabilitato e non apparirà nella finestra "
 "contatti."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Non sei connesso al server"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3481,15 +3403,15 @@ msgstr ""
 "Mostrare un avvertimento prima di mandare una password su una connessione in "
 "chiaro. Può essere 'warn', 'connect', 'disconnect'"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr "Elenco di errori SSL da ignorare (separati da uno spazio)."
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
@@ -3500,7 +3422,7 @@ msgstr ""
 "conversazioni. Puoi anche aggiungere il nome dell'account per non registrare "
 "nulla per questo account."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3509,7 +3431,7 @@ msgstr ""
 "Quanti secondi attendere per la risposta ad un ping prima di un tentativo di "
 "riconnessione?"
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3518,7 +3440,7 @@ msgstr ""
 "Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
 "file_transfer_proxies per il trasferimento dei file."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 #, fuzzy
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
@@ -3528,29 +3450,29 @@ msgstr ""
 "funzionino. È noto che questo test fallisce con i proxy Openfire anche se "
 "essi funzionano."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Se abilitato, Gajim mostrerà un'icona per indicare che il messaggio inviato "
 "è stato ricevuto dal contatto"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Consenti a Gajim di inviare informazioni sul sistema operativo che stai "
 "usando."
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Consenti a Gajim di inviare la tua ora locale."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 msgid "Message that is sent to contacts you want to add."
 msgstr "Messaggio che viene inviato ai contatti che vuoi aggiungere."
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3559,7 +3481,7 @@ msgstr ""
 "Se abilitato, Gajim invierà il tuo IP locale in modo che il tuo contatto "
 "possa connettersi al tuo computer per trasferire file."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
@@ -3568,21 +3490,17 @@ msgstr ""
 "Lista di JID separati da spazi per i quali si vuole riaprire una finestra di "
 "conversazione al prossimo avvio. "
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr "Consenti la verifica del certificato con POSH."
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3590,40 +3508,40 @@ msgid ""
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 msgid "The currently active encryption for that contact."
 msgstr "La cifratura attualmente attiva per quel contatto."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Non è possibile entrare nella stanza"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Non è possibile entrare nella stanza"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3631,7 +3549,7 @@ msgid ""
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3642,83 +3560,83 @@ msgstr ""
 "all'uscita da Gajim). Questa opzione NON DOVREBBE essere usata per "
 "(dis)attivare i plugin. Usare invece l'interfaccia grafica."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Mangio"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 msgid "I'm eating."
 msgstr "Sto mangiando."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Lavoro"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefono"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Fuori"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a godermi la vita."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Solo disponibile per conversare."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3727,1034 +3645,1033 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo soprannome."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 msgid "?Group chat name:Team"
 msgstr "?Group chat name:Squadra"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr "Discussione sul progetto"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 msgid "?Group chat address:team"
 msgstr "?Group chat address:squadra"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 msgid "?Group chat name:Family"
 msgstr "?Group chat name:Famiglia"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr "Famiglia"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 msgid "?Group chat name:Vacation"
 msgstr "?Group chat name:Vacanza"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 msgid "?Group chat address:vacation"
 msgstr "?Group chat address:vacanza"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 msgid "?Group chat name:Repairs"
 msgstr "?Group chat name:Riparazioni"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 msgid "?Group chat address:repairs"
 msgstr "?Group chat name:riparazioni"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 msgid "?Group chat name:News"
 msgstr "?Group chat name:Notizie"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 msgid "?Group chat description:Local news and reports"
 msgstr "?Group chat description:Notizie locali e rapporti"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 msgid "?Group chat address:news"
 msgstr "?Group chat address:notizie"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 msgid "Remote server not found"
 msgstr "Server remoto non trovato"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr "Time-out del server remoto"
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
 msgstr "L'indirizzo non appartiene al server di una conversazione di gruppo"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 msgid "Group chat already exists"
 msgstr "La conversazione di gruppo esiste già"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
 msgstr "La conversazione di gruppo non esiste"
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 msgid "Group chat is closed"
 msgstr "La conversazione di gruppo è chiusa"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 "Questo messaggio è stato cifrato con %s e potrebbe non essere decifrato."
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Facendo lavori domestici"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Comprando alimentari"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Pulendo"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Cucinando"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Facendo dele riparazioni"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Lavando i piatti"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Facendo il bucato"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Facendo giardinaggio"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Facendo una commissione"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Portando a spasso il cane"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Bevendo"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Bevendo una birra"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Bevendo del caffè"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Bevendo del tè."
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Facendo uno spuntino"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Facendo colazione"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Cenando"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Pranzando"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Facendo esercizi"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "In bicicletta"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Ballando"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Facendo escursionismo"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Facendo jogging"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Facendo sport"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Correndo"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Sciando"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Nuotando"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Facendo ginnastica"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Pettinando"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "Al centro benessere"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Lavandosi i denti"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Facendo un taglio di capelli"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Facendo la barba"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Facendo un bagno"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Facendo una doccia"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Ad un appuntamento"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inattivo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Giorno libero"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Passando il tempo"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Nascondendo"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "In vacanza"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Pregando"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Vacanza prenotata"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Pensando"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Rilassando"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Pescando"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Giocando"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Uscendo"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Festeggiando"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Leggendo"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Ripassando"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Facendo shopping"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Fumando"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Socializzando"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Prendendo il sole"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Guardando la TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Guardando un film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Parlando"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "Nella vita reale"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Al telefono"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "In videochiamata"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Viaggiando"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Facendo il pendolare"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Guidando"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "In automobile"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "Sul bus"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "In aereo"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "In treno"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "In viaggio"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Camminando"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Scrivendo codice"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "A una riunione"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Studiando"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Scrivendo"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Impaurito"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Stupefatto"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Voglioso"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Arrabbiato"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Infastidito"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Eccitato"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Vergognato"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Annoiato"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Coraggioso"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Calmo"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Cauto"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Raffreddato"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Fiducioso"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Confuso"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Soddisfatto"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Irritabile"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Pazzo"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Creativo"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Curioso"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Abbattuto"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Depresso"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Deluso"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Disgustato"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Costernato"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Distratto"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Imbarazzato"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Invidioso"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Emozionato"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Leggero"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustrato"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Riconoscente"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "In lutto"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Scontroso"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Colpevole"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Felice"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Speranzoso"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Accaldato"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Mortificato"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Umiliato"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Affamato"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Ferito"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Colpito"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "In venerazione"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Innamorato"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Indignato"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Interessato"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Intossicato"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Invincibile"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Geloso"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Solitario"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Perso"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Fortunato"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Meschino"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Lunatico"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervoso"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutrale"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Offeso"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Oltraggiato"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Giocoso"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Orgoglioso"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Rilassato"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Rincuorato"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Tormentato dal rimorso"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Irrequieto"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Triste"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarcastico"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Soddisfatto"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Serio"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Scioccato"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Timido"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Ammalato"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Assonnato"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontaneo"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Stressato"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Forte"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Sorpreso"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Riconoscente"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Assetato"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Stanco"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Indefinito"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Debole"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Preoccupato"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "precisione"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "altitudine"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "zona"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "direzione"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "edificio"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "paese"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "codice paese"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "datum"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "descrizione"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "errore"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "piano"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "latitudine"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "località"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "longitudine"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "codice postale"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "regione"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "stanza"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "velocità"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "strada"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "informazioni"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "orario"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Impossibile ottenere il certificato dell'entità emittente"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Impossibile ottenere la CRL del certificato"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossibile decifrare la firma del certificato"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Impossibile decifrare la firma della CRL"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Impossibile decodificare la chiave pubblica dell'entità emittente"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Fallimento firma del certificato"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Fallimento firma CRL"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Il certificato non è ancora valido"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Il certificato è scaduto"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "La CRL non è ancora valida"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "La CRL è scaduta"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Errore di formato nel campo notBefore del certificato"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Errore di formato nel campo notAfter del certificato"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Errore di formato nel campo lastUpdate della CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Errore di formato nel campo nextUpdate della CRL"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Certificato autofirmato"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificato autofirmato nella catena di certificazione"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Impossibile ottenere il certificato dell'entità emittente locale"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Impossibile verificare il primo certificato"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Catena di certificazione troppo lunga"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certificato revocato"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Certificato di una CA non valida"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Limite della lunghezza del percorso superato"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Scopo del certificato non supportato"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certificato non attendibile"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certificato rifiutato"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "L'entità emittente del soggetto non coincide"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "L'autorità e l'identificatore di chiave del soggetto non coincidono"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "L'autorità e il numero seriale dell'entità emittente non coincidono"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "L'uso della chiave non include la firma del certificato"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Fallimento verifica applicazione"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 msgid "The certificate has been revoked"
 msgstr "Il certificato è stato revocato"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 msgid "Unknown validation error"
 msgstr "Errore di validazione sconosciuto"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 msgid "The certificate has expired"
 msgstr "Il certificato è scaduto"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorizzazione accettata"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "L'account è disabilitato"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Credenziali Oauth2"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Errore di cifratura"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Estensione non supportata."
 
-#: gajim/common/const.py:909
-#, fuzzy
+#: gajim/common/const.py:942
 msgid "Authentication mechanism too weak"
-msgstr "Autenticazione con \"%s\" fallita"
+msgstr "Meccanismo di autenticazione troppo debole"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4815,12 +4732,12 @@ msgstr "Windows"
 msgid "macOS"
 msgstr "macOS"
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "Errore configurazione %s"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4839,288 +4756,244 @@ msgstr ""
 "L'errore era:\n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "ingresso audio"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "uscita audio"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "ingresso video"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Il server deve essere tra 1 e 1023 caratteri"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Carattere non valido nell'hostname."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Indirizzo del server richiesto."
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Il nome utente deve essere tra 1 e 1023 caratteri"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Carattere non valido nel nome utente."
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "La risorsa deve essere tra 1 e 1023 caratteri"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Carattere non valido nella risorsa."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Occupato"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Disponibile per conversare"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Disponibile per conversare"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "?user status:_Disponibile"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "?user status:Disponibile"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Assente"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Assente"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Non in linea"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Non in linea"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Sconosciuto"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Ha degli errori"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Nessuno"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Da"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Entrambi"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Nessuno"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Nessuno"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Nessuno"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 msgid "Owners"
 msgstr "Proprietari"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Proprietario"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 msgid "Administrators"
 msgstr "Amministratori"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 msgid "Members"
 msgstr "Membri"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "sta facendo qualcos'altro"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 msgid "is composing a message…"
 msgstr "sta scrivendo un messaggio…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o la scheda della conversazione"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d messaggio in attesa"
 msgstr[1] "%d messaggi in attesa"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, python-format
 msgid "from group chat %s"
 msgstr "dalla conversazione di gruppo %s"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr "dall'utente %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "da %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento in attesa"
 msgstr[1] "%d eventi in attesa"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Vorrei aggiungerti all'elenco dei miei contatti."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Ciao, sono $name"
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Time-out durante il caricamento dell'immagine"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "PyCURL non è installato"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "Errore caricamento immagine"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s è un file, ma dovrebbe essere una cartella"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
@@ -5227,83 +5100,83 @@ msgstr "Macchina in fase di sospensione"
 msgid "Disconnect from the network"
 msgstr "Disconnettiti dalla rete"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Il file è vuoto"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 "Il file è troppo grande, la dimensione massima permessa per i file è: %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 msgid "Encrypting file…"
 msgstr "Cifratura del file in corso…"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Modifica le informazioni sullo stato"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Modifica lo stato"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Imposta tipo di presenza e descrizione"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Libero per chat"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "In linea"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Assente a lungo"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Non disturbare"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Non in linea - disconnetti"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Descrizione della presenza:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Stato modificato."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Contatto inviato: \"%(jid)s\" (%(name)s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Contatti inviati:"
 
@@ -5327,7 +5200,7 @@ msgid "Join Automatically"
 msgstr "Unisciti automaticamente"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Account"
 
@@ -5337,7 +5210,7 @@ msgstr "Conversazione di gruppo"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 msgid "Password"
 msgstr "Password"
 
@@ -5357,7 +5230,7 @@ msgstr "Conversazioni di gruppo utilizzate di recente"
 msgid "Search group chats on selected server"
 msgstr "Cerca delle conversazioni di gruppo sul server selezionato"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
 msgstr "Entra"
 
@@ -5374,17 +5247,17 @@ msgid "Time remaining"
 msgstr "Tempo rimanente"
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Annulla"
 
@@ -5525,7 +5398,7 @@ msgstr "Copia le informazioni del certificato"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Descrizione"
 
@@ -5704,36 +5577,41 @@ msgstr "Lavoro"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "A riguardo"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 msgid "Global Group Chat Search"
 msgstr "Ricerca globale di una conversazione di gruppo"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 msgid "_Back"
 msgstr "_Indietro"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Unisciti"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
 msgstr "Seleziona l'account"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr "_Seleziona"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5801,6 +5679,7 @@ msgid "Strike"
 msgstr "Barra"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Colore"
 
@@ -5813,123 +5692,119 @@ msgstr "Carattere"
 msgid "Clear formatting"
 msgstr "Pulisci la formattazione"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 msgid "Choose encryption"
 msgstr "Scegli la cifratura"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Mostra un elenco di emoji (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Sto bloccando..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 msgid "Enter new nickname"
 msgstr "Inserisci un nuovo soprannome"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 msgid "Ch_ange"
 msgstr "C_ambia"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Cambia il soggetto"
+
+#: gajim/data/gui/groupchat_control.ui:786
 msgid "Enter password"
 msgstr "Inserisci la password"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Lascia la conversazione di gruppo"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Se marcato, Gajim entrerà in questa conversazione di gruppo all'avvio"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
-msgstr "<b>Si è verificato un errore:</b>"
+msgid "An error occurred"
+msgstr "Si è verificato un errore"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr "_Riprova"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 msgid "Kick participant"
 msgstr "Caccia il participante"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Caccia"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr "Inserisci emoji"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr "Motivo (facoltativo)"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 msgid "Ban participant"
 msgstr "Bandisci il partecipante"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Blocca"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 msgid "Destroy group chat"
 msgstr "Distruggi la conversazione di gruppo"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 msgid "_Destroy"
 msgstr "_Distruggi"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Puoi anche inserire un nome alternativo:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 msgid "Reason (optional)..."
 msgstr "Motivo (facoltativo)..."
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr "Motivo per la distruzione"
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr "Dove dovrebbero andare i partecipanti"
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
 msgstr "Inserisci un nuovo nome per questa conversazione di gruppo"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Invita"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Tipo di evento"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Descrizione dell'evento"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -6012,18 +5887,18 @@ msgid "Add"
 msgstr "Aggiungi"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 msgid "Resource"
 msgstr "Risorsa"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Stato"
 
@@ -6032,7 +5907,7 @@ msgid "Client"
 msgstr "Client"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "Sistema"
 
@@ -6168,37 +6043,38 @@ msgstr "Comportamento della _finestra"
 msgid "_Show contact list on startup"
 msgstr "_Mostra l'elenco dei contatti all'avvio"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr "Mostra l'_avatar nelle schede delle chat"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr "Posizionamento delle _schede"
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr "_Esci da Gajim quando si chiude la lista dei contatti"
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr "Comportamento di finestre e schede"
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Unisci gli account"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Mostra gli a_vatar dei contatti nella lista dei contatti"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6207,12 +6083,12 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella finestra dei "
 "contatti e nelle conversazioni di gruppo"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Mostra i _messaggi di stato dei contatti nell'elenco dei tuoi contatti"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6221,7 +6097,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni membro nella "
 "finestra dei tuoi contatti e le conversazioni di gruppo sotto il suo nome"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
@@ -6229,44 +6105,44 @@ msgstr ""
 "Mostra informazioni ag_giuntive dei contatti nell'elenco dei tuoi contatti "
 "(stato d'animo, attività, ...)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Ordina i contatti per stato"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 msgid "in _contact list"
 msgstr "nella lista dei _contatti"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "nelle conversazioni di _gruppo"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 msgid "Contact List Appearance"
 msgstr "Aspetto della lista dei contatti"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr "Abilita la copia automatica"
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr "Abilita il _controllo ortografico"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6280,27 +6156,27 @@ msgstr ""
 "testo, verrà usata la lingua predefinita per questo contatto o conversazione "
 "di gruppo."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "contenuti dei messaggi"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 msgid "_Show XHTML formatting"
 msgstr "_Mostra la formattazione XHTML"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 msgid "Display status messages in _single chats"
 msgstr "Mostra i messaggi di stato nelle chat _singole"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6309,54 +6185,54 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle conversazioni quando un "
 "contatto cambia stato o messaggio di stato."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 msgid "Show subject after _joining a group chat"
 msgstr "Mostra l'argomento dopo essersi _uniti a una conversazione di gruppo"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 msgid "Group Chat Settings"
 msgstr "Impostazioni della conversazione di gruppo"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 msgid "Show status changes (Default)"
 msgstr "Mostra i cambiamenti di stato (Predefinito)"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 msgid "Show chatstate in tabs"
 msgstr "Mostra lo stato della chat nelle schede"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6364,63 +6240,65 @@ msgid ""
 msgstr ""
 "Se marcato, Gajim permetterà agli altri di conoscere l'ora del tuo sistema"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Se marcato, Gajim permetterà agli altri di conoscere l'ora del tuo sistema"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 msgid "Chatstate"
 msgstr "Stato della chat"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Chat"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 msgid "Show _notification area icon"
 msgstr "Mostra l'icona dell'area di _notifica"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 msgid "_When new event is received"
 msgstr "_Quando viene ricevuto un nuovo evento"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Consentire notifiche/popup quando _assente/non disponibile/occupato/"
 "invisibile."
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Consentire notifiche/popup quando _assente/non disponibile/occupato/"
 "invisibile."
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Mostra una notifica per i contatti che si _connettono"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6429,46 +6307,46 @@ msgstr ""
 "Gajim notificherà i nuovi eventi tramite popup nell'angolo in fondo a destra "
 "dello schermo"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Mostra una notifica per i contatti che si _disconnettono"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Notifiche visive"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Riproduci dei _suoni"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Ge_stisci..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Consenti la riproduzione di suoni quando sono _occupato"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 msgid "Sounds"
 msgstr "Suoni"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 msgid "No_t Available"
 msgstr "No_n disponibile"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6477,7 +6355,7 @@ msgstr ""
 "Se marcato, Gajim cambierà lo stato a Non Disponibile quando il computer non "
 "è stato usato di recente"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6486,7 +6364,7 @@ msgstr ""
 "Se marcato, Gajim cambierà lo stato a Non Disponibile quando il computer non "
 "è stato usato di recente"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6499,7 +6377,7 @@ msgstr ""
 "$S verrrà sostituito dal messaggio di stato precedente\n"
 "$T verrrà sostituito dal timeout di assenza automatica"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6512,37 +6390,37 @@ msgstr ""
 "$S verrrà sostituito dal messaggio di stato precedente\n"
 "$T verrrà sostituito dal timeout di non disponibilità automatica"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 msgid "Minutes"
 msgstr "Minuti"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 msgid "Automatic Status"
 msgstr "Stato automatico"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr "_Ricorda e ripristina lo stato dell'ultima sessione"
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 msgid "Ask for status message when I"
 msgstr "Chiedi il messaggio di stato in fase di:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6550,61 +6428,61 @@ msgstr ""
 "Se abilitato, Gajim non chiederà un messaggio di stato. Sarà invece usato il "
 "messaggio predefinito specificato."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Messaggio predefinito"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 msgid "Status Messages"
 msgstr "Messaggi di stato"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Messaggi di stato predefiniti"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 msgid "Themes"
 msgstr "Temi"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 msgid "_Theme"
 msgstr "_Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Configura colore e tipo di carattere per l'interfaccia"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 msgid "_Dark Theme"
 msgstr "Tema _scuro"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr "Emoji"
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 msgid "_Emoji Theme"
 msgstr "Tema _emoji"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr "Icone"
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "_Icone di stato:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 msgid "Use transports _icons"
 msgstr "Utilizza le _icone dei trasporti"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6614,65 +6492,65 @@ msgstr ""
 "(es. Un contatto MSN avrà l'icona MSN equivalente per gli stati in linea, "
 "assente, occupato, ecc...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr "_Converti le emoji ASCII"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Stile"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Funzionalità"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr "Dispositivo di uscita a_udio"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr "Dispositivo di ingresso _audio"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr "Audio"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr "Video"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 msgid "_Video input device"
 msgstr "Dispositivo di input _video"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 msgid "Video output"
 msgstr "Uscita video"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr "_Framerate video"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr "Dimen_sione video"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr "Vi_sualizza la propria sorgente video"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Connessione"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 msgid "STU_N server"
 msgstr "Server STU_N"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -6681,49 +6559,59 @@ msgstr ""
 "Hostname del server STUN. Se non specificato, Gajim proverà\n"
 "a scoprirne uno dal server."
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr "Audio/Video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr "Proxy _globale"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Gestisci..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Varie"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Editor della configurazione avanzata (ECA)"
 
@@ -6896,12 +6784,12 @@ msgstr "utente@esempio.org"
 msgid "Your password"
 msgstr "Inserisci la password"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Azioni avanzate"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Usa nome host/porta personalizzati"
@@ -6988,7 +6876,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "C_onnessione"
@@ -7002,7 +6890,7 @@ msgstr "Scegli un altro soprannome"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7026,8 +6914,8 @@ msgstr "_Reimposta il valore"
 msgid "Resets value to default"
 msgstr "Reimposta ai valori predefiniti"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 msgid "Hostname"
 msgstr "Nome host"
 
@@ -7066,7 +6954,7 @@ msgstr "Visualizza il _certificato"
 msgid "Proxy Host"
 msgstr "_Host del proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Tipo"
 
@@ -7079,8 +6967,7 @@ msgstr "_Protocollo"
 msgid "Copy info to clipboard"
 msgstr "Copia le informazioni negli appunti"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Funzionalità"
 
@@ -7246,6 +7133,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Cambia il messaggio di stato…"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Stato d'animo:</b>"
@@ -7311,9 +7203,10 @@ msgid "Installed"
 msgstr "Installato"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "La descrizione del plugin dovrebbe essere mostrata qui. Questo testo sarà "
 "cancellato durante l'inizializzazione della finestra dei plugin."
@@ -7490,69 +7383,104 @@ msgstr "Impostazioni"
 msgid "_Name"
 msgstr "_Nome"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 msgid "Proxy"
 msgstr "Proxy"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Inizia una conversazione"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
-msgid "Create Group Chat"
+#, fuzzy
+msgid "Create _Group Chat…"
 msgstr "Crea una conversazione di gruppo"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Gestore della cronologia"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Plugin"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
-msgstr "Preferenze"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+msgid "_Preferences"
+msgstr "_Preferenze"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "Esci"
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Account"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
+#, fuzzy
+msgid "_View"
 msgstr "Visualizza"
 
-#: gajim/data/gui/application_menu.ui:42
-msgid "Show Contact List"
-msgstr "Mostra la lista dei contatti"
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
+msgid "Show _Contact List"
+msgstr "Mostra l'elenco dei _contatti"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
+#, fuzzy
+msgid "Show _Offline Contacts"
 msgstr "Mostra i contatti non in linea"
 
 #: gajim/data/gui/application_menu.ui:50
-msgid "Show Active Contacts"
+#, fuzzy
+msgid "Show _Active Contacts"
 msgstr "Mostra i contatti attivi"
 
 #: gajim/data/gui/application_menu.ui:54
-msgid "Show Transports"
+#, fuzzy
+msgid "Show _Transports"
 msgstr "Mostra i trasporti"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Console XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Trasferimento di file"
+
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
+#, fuzzy
+msgid "_Help"
 msgstr "Aiuto"
 
 #: gajim/data/gui/application_menu.ui:77
-msgid "Wiki (Online)"
+#, fuzzy
+msgid "_Wiki (Online)"
 msgstr "Wiki (online)"
 
 #: gajim/data/gui/application_menu.ui:81
-msgid "FAQ (Online)"
+#, fuzzy
+msgid "FA_Q (Online)"
 msgstr "Domande frequenti (online)"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Funzionalità"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "A riguardo"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr "Pubblica o privata?"
@@ -7567,6 +7495,10 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+msgid "Create Group Chat"
+msgstr "Crea una conversazione di gruppo"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 msgid "_Description"
 msgstr "_Descrizione"
@@ -7830,52 +7762,60 @@ msgstr "Scorciatoie dell'elenco dei contatti"
 msgid "Create new group chat"
 msgstr "Crea una conversazione di gruppo"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Plugin"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 msgid "File transfers"
 msgstr "Trasferimenti di file"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr "Imposta il messaggio di stato"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 msgid "Show XML console"
 msgstr "Mostra la console XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Aspetto"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Mostra i contatti non in linea"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 msgid "Show only active contacts"
 msgstr "Mostra solo i contatti attivi"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Mostra solamente nella lista dei contatti"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Contatti"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "Informazioni sul contatto"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr "Rinomina il contatto"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "Elimina il contatto"
 
@@ -7928,9 +7868,8 @@ msgid "Search contacts..."
 msgstr "Cerca nel database..."
 
 #: gajim/data/gui/groupchat_invite.ui:223
-#, fuzzy
 msgid "Click on contacts you would like to invite to this group chat."
-msgstr "%(jid)s è stato invitato in questa conversazione di gruppo"
+msgstr "Clicca sui contatti da invitare alla conversazione di gruppo."
 
 #: gajim/data/gui/manage_pep_services_window.ui:46
 msgid "Configure"
@@ -7949,11 +7888,15 @@ msgstr "Completa il modulo."
 msgid "Group Chat Configuration"
 msgstr "Invito in una conversazione di gruppo"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Console XML"
+
 #: gajim/data/gui/xml_console.ui:131
 msgid "Start Search..."
 msgstr "Avvia ricerca..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "Filtra"
 
@@ -7996,10 +7939,6 @@ msgstr "Mostra tutti gli _eventi in attesa"
 msgid "Mute Sounds"
 msgstr "Disabilita i suoni"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-msgid "_Preferences"
-msgstr "_Preferenze"
-
 #: gajim/data/gui/single_message_window.ui:42
 msgid "_To"
 msgstr "_A"
@@ -8334,123 +8273,123 @@ msgstr "%(progress)s di %(total)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr "%(minutes)s minuti %(seconds)s secondi"
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Group Chat Contact Role:Nessuno"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
 msgstr "Chiunque si può unire a questa conversazione di gruppo"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo:"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Supporto per le conversazioni di gruppo"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo:"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Group Chat Contact Role:Nessuno"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Supporto per le conversazioni di gruppo"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo:"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr "La conversazione di gruppo può essere trovata tramite ricerca"
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Group Chat Contact Role:Nessuno"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 msgid "This group chat can not be found via search"
 msgstr ""
 "Questa conversazione di gruppo non può essere trovata tramite una ricerca"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Supporto per le conversazioni di gruppo"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Supporto per le conversazioni di gruppo"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Supporto per le conversazioni di gruppo"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Group Chat Contact Role:Nessuno"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Invito in una conversazione di gruppo"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 msgid "Messages are archived on the server"
 msgstr "I messaggi sono archiviati sul server"
 
@@ -8478,7 +8417,7 @@ msgid "Sender: %s"
 msgstr "Mittente: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Destinatario: "
 
@@ -8630,7 +8569,7 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare dei file vuoti"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Mittente: "
 
@@ -8643,7 +8582,7 @@ msgid "Change"
 msgstr "Cambia"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Torno presto"
@@ -8673,11 +8612,12 @@ msgid "Password Change Failed"
 msgstr "È richiesta una password"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Si è verificato un errore durante la creazione dell'account"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Cambia la password"
 
@@ -8712,39 +8652,36 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Errore SSL '%s' sconosciuto"
 
-#: gajim/gtk/start_chat.py:54
-msgid "Start New Conversation"
-msgstr "Avvia una nuova conversazione"
+#: gajim/gtk/start_chat.py:55
+#, fuzzy
+msgid "Start / Join Chat"
+msgstr "Inizia una conversazione"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Non è possibile unirsi a conversazione di gruppo quando non si è connessi."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Unisciti ad una conversazione di gruppo"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-msgid "Add Contact"
-msgstr "Aggiungi un contatto"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, python-format
 msgid "%s group chats found"
 msgstr "Trovate %s conversazioni di gruppo"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8753,33 +8690,33 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Altri"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 msgid "Group Chat"
 msgstr "Conversazione di gruppo"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca dei servizi usando l'account %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Ricerca dei servizi"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8787,138 +8724,138 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controlla "
 "l'indirizzo e riprova."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Questo tipo di servizio non contiene oggetti da consultare."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Nome del server non valido"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Consultando %(address)s usando l'account %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr "Esplora"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 msgid "_Command"
 msgstr "_Comando"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Cerca"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Analizzando %(current)d / %(total)d..."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Utenti"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Iscritti"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Nodo"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 msgid "_New post"
 msgstr "_Nuovo post"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Invia un messaggio singolo"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 msgid "(No subject)"
 msgstr "(Nessun argomento)"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo utilizzando l'account %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr "Caratteri digitati: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurati di essere connesso con \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Impossibile inviare un messaggio a %s, questo JID non è valido."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
@@ -8963,29 +8900,11 @@ msgstr "Registrazione avvenuta con successo"
 msgid "Registration failed"
 msgstr "Registrazione fallita"
 
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Dizionario per la lingua \"%s\" non disponibile"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"È necessario installare il dizionario %s per usare il controllo ortografico, "
-"o configurare un'altra lingua nelle opzioni speller_language.\n"
-"\n"
-"La funzionalità di evidenziatura delle parole errate non verrà usata"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 msgid "Certificate"
 msgstr "Certificato"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
@@ -8994,55 +8913,55 @@ msgstr ""
 "Certificato per l'account\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr "Rilasciato a:\n"
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr "Nome comune (NC):"
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr "Organizzazione (O):"
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
 msgstr "Numero di serie:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr "Rilasciato da:\n"
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr "Validità\n"
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr "Rilasciato il:"
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr "Scade il:"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr "SHA-1:"
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr "SHA-256:"
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 msgid "Group Chat Invitation "
 msgstr "Invito in una conversazione di gruppo"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
@@ -9050,7 +8969,7 @@ msgstr ""
 "<b>%(contact)s</b> ti ha invitato alla conversazione di gruppo <b>"
 "%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
@@ -9063,6 +8982,10 @@ msgstr "Numero GG"
 msgid "ICQ Number"
 msgstr "Numero ICQ"
 
+#: gajim/gtk/add_contact.py:42
+msgid "Add Contact"
+msgstr "Aggiungi un contatto"
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9114,7 +9037,7 @@ msgstr "Errore durante l'aggiunta del contatto di trasporto"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9266,27 +9189,47 @@ msgstr "Contatto disconnesso"
 msgid "Contact Connected Background "
 msgstr "Contatto connesso"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Messaggio di stato"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Messaggio di stato"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Messaggio di stato"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Messaggio di stato"
+
+#: gajim/gtk/themes.py:187
 msgid "Gajim Themes"
 msgstr "Temi di Gajim"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 msgid "Invalid Name"
 msgstr "Nome non valido"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 msgid "Spaces are not allowed"
 msgstr "Non sono permessi gli spazi"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 msgid "Do you want to delete this theme?"
 msgstr "Vuoi cancellare questo tema?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
@@ -9294,11 +9237,11 @@ msgstr ""
 "Questo è il tema che stai attualmente utilizzando.\n"
 "Vuoi eliminare questo tema?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 msgid "Delete Theme"
 msgstr "Cancella tema"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 msgid "Remove Setting"
 msgstr "Rimuovi impostazione"
 
@@ -9321,10 +9264,9 @@ msgid "Error: %s"
 msgstr "Errore: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Errore"
 
@@ -9338,44 +9280,44 @@ msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "Apri"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Tutti i file"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Pulendo"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
 msgstr "Gestisci i proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 msgid "No Proxy"
 msgstr "Nessun proxy"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 msgid "Adjust to Status"
 msgstr "Regola lo stato"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "Acceso"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Spento"
 
@@ -9393,7 +9335,7 @@ msgstr "Account rimosso"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Il nuovo account è stato creato con successo"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9420,63 +9362,66 @@ msgid "_Unregister account from service"
 msgstr "_Registra un nuovo account"
 
 #: gajim/gtk/remove_account.py:217
-#, fuzzy
 msgid "Account has to be connected"
-msgstr "L'account %s è ancora connesso"
+msgstr "L'account deve essere collegato"
+
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Sincronizza cronologia"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Cosa vuoi fare?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "Un mese"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "Tre mesi"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Un anno"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "Tutto"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "Connessione in corso…"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s di %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, python-format
 msgid "Downloaded %s messages"
 msgstr "Scaricati %s messaggi"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr "Gajim è completamente sincronizzato con l'archivio."
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 msgid "A GTK XMPP client"
 msgstr "Un client XMPP GTK"
 
@@ -9538,113 +9483,113 @@ msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
 "Milo Casagrande <milo@ubuntu.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr "Scegli il file da inviare…"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 msgid "Choose Avatar…"
 msgstr "Seleziona un avatar…"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 msgid "PNG files"
 msgstr "File PNG"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 msgid "JPEG files"
 msgstr "File JPEG"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr "File SVG"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Immagini"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Seleziona un archivio"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 msgid "ZIP files"
 msgstr "File ZIP"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr "Salva file come..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 msgid "_Open"
 msgstr "_Apri"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s di questa conversazione di gruppo"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Connesso"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
 msgstr "Nome del file:"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
 msgstr "?Noun:Download"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 msgid "?Noun:Upload"
 msgstr "?Noun:Upload"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 msgid "?transfer type:Type: "
 msgstr "?transfer type:Tipo: "
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:In pausa"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 msgid "?transfer status:Status: "
 msgstr "?transfer status:Stato: "
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:In pausa"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:In pausa"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:In pausa"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:In pausa"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:In pausa"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:In pausa"
@@ -9653,7 +9598,7 @@ msgstr "?transfer status:In pausa"
 msgid " (optional)..."
 msgstr " (facoltativo)..."
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 msgid "Invalid Address"
 msgstr "Indirizzo non valido"
 
@@ -9706,23 +9651,23 @@ msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo"
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in una conversazione di gruppo"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 msgid "Required"
 msgstr "Richiesto"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Sì"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Annulla"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr "Invia"
 
@@ -9739,10 +9684,6 @@ msgstr "usando l'account %s"
 msgid "Hide _Contact List"
 msgstr "Nascondi l'elenco dei _contatti"
 
-#: gajim/gtk/statusicon.py:270
-msgid "Show _Contact List"
-msgstr "Mostra l'elenco dei _contatti"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Nascondi questo menù"
@@ -9788,33 +9729,29 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprova più tardi."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Preferenze di archiviazione per %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 msgid "Archiving Preferences Saved"
 msgstr "Preferenze di archiviazione salvate"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "Le preferenze di archiviazione sono state salvate!"
 
-#: gajim/gtk/mam_preferences.py:101
-msgid "No response from the Server"
-msgstr "Nessuna risposta dal server"
-
-#: gajim/gtk/mam_preferences.py:103
-msgid "Error received: {}"
-msgstr "Errore ricevuto: {}"
-
-#: gajim/gtk/mam_preferences.py:105
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
 msgid "Archiving Preferences Error"
 msgstr "Archiviazione preferenze"
 
+#: gajim/gtk/mam_preferences.py:108
+msgid "Error received: {}"
+msgstr "Errore ricevuto: {}"
+
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Attivato"
@@ -9861,32 +9798,32 @@ msgstr "?Ask (for Subscription):Nessuno"
 msgid "?password:Hidden"
 msgstr "?password:Nascosta"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr "Supporto"
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr "Sicurezza"
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr "Feedback"
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr "Abuso"
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr "Vendite"
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s giorni, %(hours)s ore"
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 msgid ""
 "\n"
 "Disabled in preferences"
@@ -9894,27 +9831,27 @@ msgstr ""
 "\n"
 "Disabilitato nelle preferenze."
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Audio / Video"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Possibilità di iniziare una conversazione audio-video."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
 msgstr "Funzione non disponibile sotto Windows"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -9923,19 +9860,19 @@ msgstr ""
 "Possibilità di misurare il tempo di inattività, per poter cambiare lo stato "
 "automaticamente."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr "Richiede: libxss"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr "Nessun requisito aggiuntivo"
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf (chat senza server)"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -9944,57 +9881,57 @@ msgstr ""
 "Sistema di chat senza server con i client rilevati automaticamente nella "
 "rete locale."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Richiede: gir1.2-avahi-0.6"
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Richiede: pybonjour e SDK bonjour in esecuzione (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Impostazioni della connessione"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Richiede: Gspell"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Funzione non disponibile sotto Windows"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Notifiche"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Possibilità di iniziare una conversazione audio-video."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Richiede python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Memorizza la password"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
@@ -10003,32 +9940,32 @@ msgstr ""
 "Le password possono essere salvate in modo sicuro e non in un semplice file "
 "di testo."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Richiede gnome-keyring e python-gnome2-desktop o kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Correttore ortografico"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr "Richiede: Gspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 #, fuzzy
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
@@ -10036,12 +9973,12 @@ msgstr ""
 "Possibilità di richiedere al proprio router l'inoltro delle porte per il "
 "trasferimento file."
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Richiede python-gupnp-igd."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Archiviazione preferenze"
@@ -10088,7 +10025,7 @@ msgstr "Nome dell'elenco non valido"
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Invita contatti"
@@ -10115,7 +10052,7 @@ msgstr "_Fine"
 msgid "Commands"
 msgstr "Comandi"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr "Successivo"
 
@@ -10180,119 +10117,131 @@ msgstr "Richiesta di iscrizione da parte di %s"
 msgid "Loading"
 msgstr "Caricamento in corso"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "_Connetti"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Connetti"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Rimozione dell'account in corso..."
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Tentativo di rimozione dell'account in corso..."
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connessione in corso…"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Il server non supporta vCard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Non sono permessi gli spazi"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Il server non supporta vCard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
-#, fuzzy
+#: gajim/gtk/account_wizard.py:454
 msgid "Account is being created"
-msgstr "L'account %s è ancora connesso"
+msgstr "L'account è stato creato"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 msgid "Add Account"
 msgstr "Aggiungi account"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Crea un nuovo post"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Si deve scegliere un numero di porta."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "La risorsa deve essere tra 1 e 1023 caratteri"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Azioni avanzate"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Sicurezza"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Errore SSL '%s' sconosciuto"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Rimuovi l'account"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
-#, fuzzy
+#: gajim/gtk/account_wizard.py:895
 msgid "Register on the Website"
-msgstr "Registra a %s"
+msgstr "Registrati sul sito Web"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Account rimosso"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 msgid "All Accounts"
 msgstr "Tutti gli account"
 
@@ -10329,233 +10278,237 @@ msgstr "Risultato della ricerca"
 msgid "No results found"
 msgstr "Nessun risultato trovato"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Predefinito"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Effettuare un nuovo accesso?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Effettuare un nuovo accesso?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
 "nuovo login."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr "_Più tardi"
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Per piacere, controlla se Avahi o Bonjour sono installati."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Per piacere, controlla se Avahi o Bonjour sono installati."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 msgid "Disable Account"
 msgstr "Disabilita l'account"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, python-format
 msgid "Account %s is still connected"
 msgstr "L'account %s è ancora connesso"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Tutte le finestre di conversazione e le conversazioni di gruppo saranno "
 "chiuse. Si desidera continuare?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 msgid "_Disable Account"
 msgstr "_Disabilita l'account"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr "Etichetta"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr "Accedi"
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "Importa contatti"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-msgid "Client Certificate"
-msgstr "Certificato del client"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 msgid "Connect on startup"
 msgstr "Connetti all'avvio"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 msgid "Save conversations for all contacts"
 msgstr "Salva le conversazioni per tutti i contatti"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 msgid "Global Status"
 msgstr "Stato globale"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Cambia lo stato degli account"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Usa un proxy per il trasferimento di file"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 msgid "Idle Time"
 msgstr "Tempo di inattività"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr "Orario locale del sistema"
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 msgid "Client / Operating System"
 msgstr "Client / Sistema operativo"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Consenti a Gajim di inviare informazioni sul sistema operativo che stai "
 "usando."
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 msgid "Ignore Unknown Contacts"
 msgstr "Ignora i contatti sconosciuti"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti al tuo elenco"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr "Priorità"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_usa la variabile d'ambiente HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 msgid "Synchronize the status of all accounts"
 msgstr "Sincronizza lo stato di tutti gli account"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 msgid "First Name"
 msgstr "Nome"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 msgid "Last Name"
 msgstr "Cognome"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 msgid "Email"
 msgstr "E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Modifica lo stato"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Abilita"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 msgid "Port"
 msgstr "Porta"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 msgid "Connection Settings"
 msgstr "Impostazioni della connessione"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+msgid "Client Certificate"
+msgstr "Certificato del client"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PKCS12 File"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 msgid "Encrypted Certificate"
 msgstr "Certificato cifrato"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 msgid "Certificate Settings"
 msgstr "Impostazioni del certificato"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 msgid "Save Password"
 msgstr "Salva la password"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 msgid "Login Settings"
 msgstr "Impostazioni dell'accesso"
 
@@ -10609,19 +10562,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Rimosso %d contatto"
 msgstr[1] "Rimossi %d contatti"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Artista sconosciuto"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Titolo sconosciuto"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Risorsa sconosciuta"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10635,20 +10588,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Segnalibri per %s"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Archivio corrotto"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "Archivio vuoto"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "L'archivio è malformato"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Il plugin esiste già"
@@ -10700,123 +10653,251 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Mostra l'evento in attesa successivo"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 msgid "Features:"
 msgstr "Funzionalità:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr "Invita degli amici in conversazioni di gruppo, oppure unisciti ad una"
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr "Mantieni e gestisci tutta la tua cronologia delle conversazioni"
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr "Organizza le tue chat con delle schede"
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Correzione ortografica dei messaggi."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr "Supporto per account multipli"
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Ricerca dei servizi inclusi i nodi, ricerca utente"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Lista dei contatti"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 msgid "Group chat support"
 msgstr "Supporto per le conversazioni di gruppo"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Chat history"
 msgstr "Cronologia della chat"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 msgid "Plugin manager"
 msgstr "Gestore dei plugin"
 
+#~ msgid "Start New Conversation"
+#~ msgstr "Avvia una nuova conversazione"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "Simula perdita di connettività"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "Simula il recupero di connettività"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Errore SSL sconosciuto: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Selezione l'intervallo tra 2 controlli di inattività."
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Dizionario per la lingua \"%s\" non disponibile"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "È necessario installare il dizionario %s per usare il controllo "
+#~ "ortografico, o configurare un'altra lingua nelle opzioni "
+#~ "speller_language.\n"
+#~ "\n"
+#~ "La funzionalità di evidenziatura delle parole errate non verrà usata"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Riconnetti"
+
+#~ msgid "Quit"
+#~ msgstr "Esci"
+
+#~ msgid "Show Contact List"
+#~ msgstr "Mostra la lista dei contatti"
+
+#~ msgid "Add to Contact List"
+#~ msgstr "Aggiungi alla lista dei contatti"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Invita contatti"
+
+#~ msgid "Configure Group Chat"
+#~ msgstr "Configura la conversazione di gruppo"
+
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Distruggi la conversazione di gruppo"
+
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Se abilitato, Gajim mostrerà un'icona su ogni scheda contenente dei "
+#~ "messaggi non letti. A seconda del tema, questa icona può essere animata."
+
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "Mostra l'_avatar nelle schede delle chat"
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Il server deve essere tra 1 e 1023 caratteri"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Carattere non valido nell'hostname."
+
+#~ msgid "Server address required."
+#~ msgstr "Indirizzo del server richiesto."
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Il nome utente deve essere tra 1 e 1023 caratteri"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Carattere non valido nel nome utente."
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "La risorsa deve essere tra 1 e 1023 caratteri"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Carattere non valido nella risorsa."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Mostra una notifica per i contatti che si _connettono"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Mostra una notifica per i contatti che si _disconnettono"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Colore della notifica di un nuovo messaggio/email."
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Notifica quando un trasferimento file viene completato"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Notifica quando un trasferimento file viene completato"
+
+#~ msgid "Notification color for group chat invitations."
+#~ msgstr "Colore della notifica per gli inviti alle conversazioni di gruppo."
+
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Colore di sfondo delle notifiche per i cambi di stato."
+
+#~ msgid "Notification color for other dialogs."
+#~ msgstr "Colore delle notifiche per gli altri dialoghi."
+
+#~ msgid "Event Type"
+#~ msgstr "Tipo di evento"
+
+#~ msgid "Event desc"
+#~ msgstr "Descrizione dell'evento"
+
+#~ msgid "No response from the Server"
+#~ msgstr "Nessuna risposta dal server"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Conflitto tra risorse"
 
@@ -11465,9 +11546,6 @@ msgstr "Gestore dei plugin"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Invia un messaggio privato"
 
-#~ msgid "Send _File"
-#~ msgstr "Invia un _file"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Partecipanti"
@@ -14377,9 +14455,6 @@ msgstr "Gestore dei plugin"
 #~ "alle tue configurazioni puoi selezionarne un'altra qui.\n"
 #~ "Potresti considerare di cambiare la configurazione del firewall"
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Unisci gli account"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "Non è possibile usare OpenPGP su questo computer"
 
@@ -14961,9 +15036,6 @@ msgstr "Gestore dei plugin"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Richiede python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Richiede gnome-keyring e python-gnome2-desktop o kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/ja.po b/po/ja.po
index a68620386..88f9fd64b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,63 +14,69 @@ msgstr ""
 "X-Pootle-Path: /ja/gajim/ja.po\n"
 "X-Pootle-Revision: 1602\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, python-format
+msgid "Account: %s"
+msgstr "アカウント: %s"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "認証されています"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "認証されていません"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s の暗号化は有効 %(authenticated)s。"
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "元に戻す (_U)"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "消去 (_C)"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "引用として貼付"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "画像を貼り付け"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr "画像を貼り付けようとしています"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "本当にクリップボードからチャットウィンドウに画像を貼り付けますか ?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "次回から質問しない (_D)"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "貼り付け (_P)"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "プライバシー"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "警告"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
@@ -78,7 +84,7 @@ msgstr ""
 "ファイルを <b>%s</b> に送信すると、その相手はあなたの本当の JID を知ることに"
 "なります。"
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "続ける (_C)"
 
@@ -140,430 +146,425 @@ msgstr "保留中の在席通知の申し込みはありません。"
 msgid " resource with priority "
 msgstr " リソース。優先順位は "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 msgid "Not in contact list"
 msgstr "相手先一覧にありません"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 msgid "I would like to add you to my contact list"
 msgstr "あなたを私の相手先一覧に追加したいと思います"
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "単発メッセージを送信…(_M)"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "コマンド実行…(_X)"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "中継先の管理 (_M)"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "中継先の変更 (_M)"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "名前の変更…(_R)"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "遮断の解除 (_U)"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "遮断 (_B)"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "削除 (_V)"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "情報 (_I)"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "ファイルを送信…"
+#: gajim/gui_menu_builder.py:517
+msgid "Send File"
+msgstr "ファイルを送信"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
 msgstr "ファイルをアップロード…"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr "直接ファイルを送信…"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 msgid "Send Chatstate"
 msgstr "チャット状態を送信"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
-msgstr "相手先を招待"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+msgid "Invite Contacts…"
+msgstr "相手先を招待…"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
-msgid "Add to Contact List"
-msgstr "相手先一覧に追加"
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
+msgid "Add to Contact List…"
+msgstr "相手先一覧に追加…"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 msgid "Voice Chat"
 msgstr "音声チャット"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 msgid "Video Chat"
 msgstr "ビデオチャット"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "情報"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "履歴"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "無効"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+msgid "Composing Only"
 msgstr "入力中のみ"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
+#: gajim/gui_menu_builder.py:535
+msgid "All Chat States"
 msgstr "すべてのチャット状態"
 
-#: gajim/gui_menu_builder.py:575
-msgid "Invite Contact"
-msgstr "相手先を招待"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 msgid "Manage Group Chat"
-msgstr "グループチャットを管理"
-
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
-msgid "Rename Group Chat"
-msgstr "グループチャットから退出"
+msgstr "談話室を管理"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
-msgstr "談話室の題を変更"
+#: gajim/gui_menu_builder.py:575
+msgid "Rename…"
+msgstr "名前の変更…"
 
-#: gajim/gui_menu_builder.py:579
-msgid "Configure Group Chat"
-msgstr "グループチャットを調整"
+#: gajim/gui_menu_builder.py:576
+msgid "Change Subject…"
+msgstr "談話室の題を変更…"
 
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "アバターをアップロード…"
 
-#: gajim/gui_menu_builder.py:581
-msgid "Destroy Group Chat"
-msgstr "グループチャットを閉鎖"
+#: gajim/gui_menu_builder.py:578
+msgid "Configure…"
+msgstr "調整…"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+msgid "Destroy…"
+msgstr "閉鎖…"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 msgid "Chat Settings"
 msgstr "チャットの設定"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr "入室/退出を表示"
 
-#: gajim/gui_menu_builder.py:585
-msgid "Show status changes"
+#: gajim/gui_menu_builder.py:583
+msgid "Show Status Changes"
 msgstr "状況変更を表示"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
-msgstr "すべてのメッセージを通知する"
+#: gajim/gui_menu_builder.py:584
+msgid "Notify on all Messages"
+msgstr "すべてのメッセージを通知"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr "閉じるボタンで最小化"
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr "自動参加して最小化"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "同期の制限"
 
-#: gajim/gui_menu_builder.py:593
-msgid "Change Nickname"
-msgstr "ニックネームを変更"
+#: gajim/gui_menu_builder.py:591
+msgid "Change Nickname…"
+msgstr "ニックネームを変更…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "発言権を要求"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "コマンドを実行"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+msgid "Execute Command…"
+msgstr "コマンド実行…"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr "退出"
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "制限なし"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i日"
 msgstr[1] "%i日"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "入力中のみ"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "すべてのチャット状態"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
 msgstr "相手先を追加…"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "プロフィール"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "単発メッセージを送信…"
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
-msgstr "サービスを探索"
+#: gajim/gui_menu_builder.py:674
+msgid "Discover Services…"
+msgstr "サービスを探索…"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "サーバー情報"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "拡張"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "書庫の設定"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 msgid "Blocking List"
 msgstr "追放者の一覧"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 msgid "PEP Configuration"
 msgstr "PEP の調整"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
-msgstr "履歴を同期"
+#: gajim/gui_menu_builder.py:681
+msgid "Synchronise History…"
+msgstr "履歴を同期…"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "プライバシーリスト"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
 msgstr "管理"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 msgid "Send Server Message…"
 msgstr "サーバーメッセージを送信..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 msgid "Set MOTD…"
 msgstr "MOTD を設定…"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr "MOTD を更新…"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 msgid "Delete MOTD…"
 msgstr "MOTD を削除…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 msgid "_Add Account…"
 msgstr "アカウントを追加…(_A)"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 msgid "_Modify Accounts…"
 msgstr "アカウントを編集…(_M)"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 msgid "_Modify Account…"
 msgstr "アカウントを編集…(_M)"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "アカウント"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 msgid "Copy XMPP Address"
 msgstr "XMPP アドレスをコピー"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
-msgstr "グループチャットに参加"
+msgstr "談話室に参加"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "チャットを開始"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-msgid "Add to Contact List…"
-msgstr "相手先一覧に追加…"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
 msgstr "リンクの場所をコピー"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 msgid "Open Link in Browser"
 msgstr "リンク先をブラウザで開く"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
 msgstr "Eメールアドレスをコピー"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 msgid "Open Email Composer"
 msgstr "メール作成画面を開く"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 msgid "Copy Location"
 msgstr "場所をコピー"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 msgid "Show Location"
 msgstr "位置を表示"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 msgid "Copy XMPP Address/Email"
 msgstr "XMPP アドレス/Eメールをコピー"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 msgid "Invite"
 msgstr "招待"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr "遮断の解除"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr "遮断"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 msgid "Kick"
 msgstr "蹴り出し"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 msgid "Ban"
 msgstr "締め出し"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 msgid "Make Owner"
 msgstr "主宰者にする"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 msgid "Make Admin"
 msgstr "管理人にする"
 
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 msgid "Make Member"
 msgstr "メンバーにする"
 
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 msgid "Revoke Member"
 msgstr "メンバーを取り消す"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr "発言権を与える"
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 msgid "Revoke Voice"
 msgstr "発言権を取り消す"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 msgid "Copy"
 msgstr "コピー"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "使い方:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "オプション:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "このヘルプを表示して終了"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "記録ファイルのフォルダーを選択してください"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "履歴記録データベースが見つかりません"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "%s がありません"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 msgid "XMPP Address"
 msgstr "XMPP アドレス"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "日付"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -571,27 +572,27 @@ msgstr "日付"
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "メッセージ"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "題"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "データベースの掃除"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 msgid "Clean up the database?"
 msgstr "データベースを消去しますか ?"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
@@ -601,182 +602,177 @@ msgstr ""
 "通常、データベース領域が空になるわけではなく、再使用可能になるだけです。この"
 "操作には時間がかかります。"
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 msgid "_Cleanup"
 msgstr "消去 (_C)"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "あなた"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s 、%(who)s さんは言いました: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "削除"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "会話を削除"
 msgstr[1] "会話を削除"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "本当に、<b>%s</b> との会話を削除しますか ?"
 msgstr[1] "本当に、これらの会話を削除しますか ?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "メッセージを削除"
 msgstr[1] "メッセージを削除"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "本当に、このメッセージを削除しますか ?"
 msgstr[1] "本当に、これらのメッセージを削除しますか ?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "相手先名: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr "XMPP アドレス: <i>%s</i>"
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "全般"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "グループ"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "グループ内"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "気分の設定"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "なし"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s の状況メッセージ"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "状況メッセージ"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr "上書き"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "状況メッセージを上書きしますか ?"
 
-#: gajim/dialogs.py:702
-#, fuzzy
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
-msgstr "この名前は既に使われています。この状況メッセージを上書きしますか ?"
+msgstr "この名前は既に使われています。この事前設定を上書きしますか ?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr "上書き (_O)"
 
-#: gajim/dialogs.py:718
-#, fuzzy
+#: gajim/dialogs.py:716
 msgid "Status Preset"
-msgstr "状況メッセージ"
+msgstr "状況の事前設定"
 
-#: gajim/dialogs.py:719
-#, fuzzy
+#: gajim/dialogs.py:717
 msgid "Save status as preset"
-msgstr "用意しておくメッセージとして保存..."
+msgstr "状況を事前設定として保存"
 
-#: gajim/dialogs.py:720
-#, fuzzy
+#: gajim/dialogs.py:718
 msgid "Please assign a name to this status message preset"
-msgstr "この状況メッセージの名前を入力してください"
+msgstr "この状況メッセージの事前設定に名前を付けてください"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 msgid "_Save"
 msgstr "保存 (_S)"
 
-#: gajim/dialogs.py:725
-#, fuzzy
+#: gajim/dialogs.py:723
 msgid "New Status"
-msgstr "在席状況"
+msgstr "新しい状況"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "サーバーに接続していません"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "接続していないと、相手先を合わせることはできません。"
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "名前"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "サーバー"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "このアカウントはサーバーに接続していません"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "接続していないと、相手先に合わせることはできません。"
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "同調"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "音声とビデオ"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "音声"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "ビデオ"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -785,85 +781,89 @@ msgstr ""
 "%(contact)s さんは、%(type)s で会話を始めようとしています。呼び出しに応じます"
 "か ?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "ファイルを送信…"
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "ファイルを送信 (最大. %s MiB)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 msgid "No File Transfer available"
 msgstr "ファイル転送は利用できません"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 msgid "Invalid XMPP Address"
 msgstr "XMPP アドレスが正しくありません"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "画像を読み込めませんでした"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, python-format
 msgid "Kick %s"
 msgstr "%s を蹴り出す"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr "%s を締め出す"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "ニックネームを挿入"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 msgid "Voice Request"
 msgstr "発言権を要求"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr "承認 (_A)"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s さんは題を %(subject)s に設定しました"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr "談話室はメンバー以外にも見えます"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 msgid "Group chat now does not show unavailable members"
 msgstr "談話室はメンバー以外には見えません"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr "プライバシーに関係のない設定が変更されました"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 msgid "Conversations are stored on the server"
 msgstr "会話はサーバーに保管されます"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 msgid "Conversations are not stored on the server"
 msgstr "会話はサーバーに保管されません"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 msgid "Group chat is now non-anonymous"
 msgstr "談話室は非匿名になります"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 msgid "Group chat is now semi-anonymous"
 msgstr "談話室は半匿名になります"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 msgid "Group chat is now fully anonymous"
 msgstr "談話室は完全匿名になります"
 
@@ -877,7 +877,7 @@ msgstr "Ping? (%s)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "エラーです。"
 
@@ -888,7 +888,7 @@ msgstr "あなた (%s) が談話室に参加しました"
 
 #: gajim/groupchat_control.py:1243
 msgid "Any participant is allowed to see your full XMPP Address"
-msgstr "在室者の誰もがあなたの完全 XMPP アドレス を知ることができます"
+msgstr "参加者の誰もがあなたの完全 XMPP アドレス を知ることができます"
 
 #: gajim/groupchat_control.py:1251
 msgid "The server has assigned or modified your nickname in this group chat"
@@ -900,26 +900,25 @@ msgid "A new group chat has been created"
 msgstr "新しい談話室が作成されました"
 
 #: gajim/groupchat_control.py:1265
-#, fuzzy
 msgid "Failed to Configure Group Chat"
-msgstr "グループチャットを調整"
+msgstr "談話室の調整に失敗しました"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "あなたは %s として認識されます"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} は現在 {new_nick} と認識されました"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "あなたは現在 {show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} は現在 {show}{status}"
@@ -955,14 +954,14 @@ msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** {actor} によって、{nick} の役は {role} に設定されました: {reason}"
 
 #: gajim/groupchat_control.py:1386
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "You have been removed from the group chat{actor}{reason}"
-msgstr "%(nick)s は退出しました (%(reason)s)"
+msgstr "{actor} によって、この談話室から削除されました ({reason})"
 
 #: gajim/groupchat_control.py:1391
 #, python-brace-format
 msgid "You have left due to an error{reason}"
-msgstr ""
+msgstr "エラーのため、あなたは退出しました: {reason}"
 
 #: gajim/groupchat_control.py:1397
 #, python-brace-format
@@ -972,7 +971,7 @@ msgstr "{actor} によって、あなたは蹴り出されました: {reason}"
 #: gajim/groupchat_control.py:1404
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
-msgstr "{actor} によって、あなたは閉め出されました: {reason}"
+msgstr "{actor} によって、あなたは締め出されました: {reason}"
 
 #: gajim/groupchat_control.py:1411 gajim/groupchat_control.py:1476
 msgid ": Affiliation changed"
@@ -983,29 +982,29 @@ msgid ": Group chat configuration changed to members-only"
 msgstr "談話室はメンバー制に変更されました"
 
 #: gajim/groupchat_control.py:1445
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "{nick} has been removed from the group chat{by}{reason}"
-msgstr "%(nick)s は退出しました (%(reason)s)"
+msgstr "{nick} は削除されました ({by}{reason})"
 
 #: gajim/groupchat_control.py:1455
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
-msgstr ""
+msgstr "エラーのため、{nick} は退出しました: {reason}"
 
 #: gajim/groupchat_control.py:1461
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{actor} によって、{nick} は蹴り出されました: {reason}"
 
 #: gajim/groupchat_control.py:1469
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
-msgstr "%(nick)s は締め出されました: %(reason)s"
+msgstr "{actor} によって、{nick} は締め出されました: {reason}"
 
 #: gajim/groupchat_control.py:1486
 #, python-brace-format
 msgid "{nick} has left{reason}"
-msgstr ""
+msgstr "{nick} は退出しました: {reason}"
 
 #: gajim/groupchat_control.py:1508
 #, python-format
@@ -1013,14 +1012,12 @@ msgid "%s has joined the group chat"
 msgstr "%s が談話室に参加しました"
 
 #: gajim/groupchat_control.py:1520
-#, fuzzy
 msgid "Failed to Join Group Chat"
-msgstr "グループチャットに参加できません"
+msgstr "談話室への参加に失敗しました"
 
 #: gajim/groupchat_control.py:1526
-#, fuzzy
 msgid "Failed to Create Group Chat"
-msgstr "グループチャットから退出"
+msgstr "談話室の作成に失敗しました"
 
 #: gajim/groupchat_control.py:1542
 msgid "Group chat has been destroyed"
@@ -1033,7 +1030,7 @@ msgstr "代わりに次の談話室に参加できます: xmpp:%s?join"
 
 #: gajim/groupchat_control.py:1732
 msgid "Leave Group Chat"
-msgstr "グループチャットから退出"
+msgstr "談話室から退出"
 
 #: gajim/groupchat_control.py:1733
 msgid "Are you sure you want to leave this group chat?"
@@ -1044,52 +1041,51 @@ msgstr "本当にこの談話室から退出しますか ?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "このウィンドウを閉じると、’%s’ を退出します。"
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr "退出 (_L)"
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s は既にこの談話室に招待されています"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "書式の一覧を表示する"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "この相手先は HTML に対応していません。"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s 秒)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s の状態: %(state)s  理由: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s さん (グループチャット %(room_name)s より)"
+msgstr "%(nickname)s さん (談話室 %(room_name)s より)"
 
-#: gajim/chat_control.py:1162
-#, fuzzy
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
-msgstr "このアカウントの暗号化セッションを有効にします。"
+msgstr "注意: この相手先の会話履歴は無効になっています。"
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
-msgstr ""
+msgstr "注意: このアカウントの会話履歴は無効になっています。"
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, python-format
 msgid ""
 "You just received a new message from %s.\n"
@@ -1098,26 +1094,26 @@ msgstr ""
 "\"%s\" さんから新しいメッセージを受信しました。\n"
 "このタブを閉じますか ?"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 msgid "Close"
 msgstr "閉じる"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "新着メッセージ"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr "閉じる (_C)"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1126,174 +1122,164 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s さんは現在、%(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "ファイルを転送"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "サイズ"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 msgid "_Accept"
 msgstr "承認 (_A)"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
-#, fuzzy
 msgid "_Decline"
-msgstr "オフライン (_O)"
+msgstr "拒否 (_D)"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "ファイルの転送の完了"
 
 # #(Mako)Containing をどうする
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 msgid "Open _Folder"
 msgstr "フォルダを開く (_F)"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 msgid "Group Chat Invitation"
 msgstr "談話室への招待"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
-msgstr "遠くの相手先が転送を中止しました"
+msgstr "向こうの相手先が転送を中止しました"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "ファイルを開く際のエラー"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "ファイルの転送が中断しました"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "ファイルの転送が中止されました"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "ピア接続は確立できません。"
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr "アプリケーションのバージョンを表示"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "深刻なエラーのみ表示"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr "プロフィールのファイルを完全に分離する(履歴データベースやプラグインも)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr "XML スタンザとその他のデバッグ情報を出力"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "設定ディレクトリ内の設定ファイルを指定"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "設定ファイルのディレクトリを指定"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "ログシステムを設定"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "すべての警告を表示"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "IPython のシェルを開く"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "次の保留イベントをポップアップウィンドウに表示します"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "新しいチャットを開始"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "接続の喪失を模する"
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "接続の回復を模する"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "データベースのエラー"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "統合アカウント"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "中継先"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 msgid "Group chats"
-msgstr "グループチャット"
+msgstr "談話室"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr "承認が送信されました"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "現在 \"%s\" さんはあなたの在席状況を知ることができます。"
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "在席通知の申し込みを送信しました"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "\"%s\" さんがこの申し込みを承認したら、相手先の在席状況を知ることができます。"
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
-msgstr "承認が取り消されました"
+msgstr "承認を削除しました"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" さんは常にあなたをオフラインとして見ることになります。"
@@ -1302,7 +1288,7 @@ msgstr "\"%s\" さんは常にあなたをオフラインとして見ること�
 msgid "desynced"
 msgstr "不揃い"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr "Gajim を終了"
 
@@ -1320,7 +1306,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "常に Gajim を終了する"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "終了 (_Q)"
 
@@ -1349,7 +1336,6 @@ msgid "You still have unread messages"
 msgstr "未読のメッセージがあります"
 
 #: gajim/roster_window.py:2473
-#, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
 "history is enabled and if the contact is in your contact list."
@@ -1382,13 +1368,14 @@ msgid "Transports will be removed"
 msgstr "中継先を削除します"
 
 #: gajim/roster_window.py:2746
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using these transports:\n"
 "%s"
 msgstr ""
-"もうこれらの中継先をとおして相手先とメッセージを送受信することはできません。"
+"もうこれらの中継先をとおして相手先とメッセージを送受信することはできません:\n"
+"%s"
 
 #: gajim/roster_window.py:2750
 msgid "Remove Transport"
@@ -1460,8 +1447,8 @@ msgstr "グループ %s の名前を変更しますか ?"
 msgid "Please enter a new name"
 msgstr "新しい名前を入力してください"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 msgid "_Rename"
 msgstr "名前の変更 (_R)"
 
@@ -1478,24 +1465,28 @@ msgstr "相手先一覧から %s を削除しますか ?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "相手先一覧のこのグループのすべての相手先も削除します (_A)"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+msgid "Rename Group Chat"
+msgstr "談話室から退出"
+
+#: gajim/roster_window.py:3045
 msgid "Please enter a new name for this group chat"
 msgstr "この談話室の新しい名前を入力してください"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 msgid "Remove Contact"
 msgstr "相手先を削除"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 msgid "Remove contact from contact list"
 msgstr "相手先を相手先一覧から削除します"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "%(name)s (%(jid)s) を相手先一覧から削除しようとしています。\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
@@ -1503,20 +1494,20 @@ msgstr ""
 "この相手先を相手先一覧から削除すると、在席通知の承認も取り消します。この相手"
 "先はあなたを常にオフラインとして見ることになります。"
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "続けますか ?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr "削除後も、この相手先に自分の在席状況を知らせる (_I)"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 msgid "Remove contacts from contact list"
 msgstr "相手先を相手先一覧から削除します"
 
-#: gajim/roster_window.py:3343
-#, fuzzy, python-format
+#: gajim/roster_window.py:3334
+#, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
 "means they will see you as offline:\n"
@@ -1524,25 +1515,27 @@ msgid ""
 "%s"
 msgstr ""
 "これら相手先を相手先一覧から削除すると、在席通知の承認も取り消します。これら"
-"の相手先はあなたを常にオフラインとして見ることになります。"
+"の相手先はあなたを常にオフラインとして見ることになります:\n"
+"\n"
+"%s"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 msgid "Remove Contacts"
 msgstr "相手先を削除"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "アカウントがありません"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "相手先とチャットを開始する前に、アカウントを作成してください。"
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "サーバーはメタ相手先の保存に対応していません"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1550,11 +1543,11 @@ msgstr ""
 "サーバーはメタ相手先の情報の保存に対応していません。したがってその情報は次の"
 "接続の際には失われています。"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
 msgstr "メタ相手先を作成しようとしています"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
@@ -1563,128 +1556,127 @@ msgstr ""
 "メタ相手先は、いくつかの相手先を一行にまとめるひとつの方法です。一般に、同一"
 "人物が複数の XMPP アカウントや中継先アカウントを持っているときに使用します。"
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 msgid "Create Metacontact"
 msgstr "メタ相手先を作成"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr "作成 (_C)"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "ファイルの URI が正しくありません:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "このファイルを %s さんに転送します:\n"
 msgstr[1] "これらのファイルを %s さんに転送します:\n"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "送信 (_S)"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "%(from)s を %(to)s に送信"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s を優先の相手先とする"
 
 # (Mako) よくわからない。Make [c_source.get_shown_name()] and [c_dest.get_shown_name()] metacontacts
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%(contact1)s と %(contact2)s をメタ相手先とする"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "状況メッセージの変更 (_C)"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "聴いている楽曲名を公開"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "位置情報を公開"
 
 # (Mako)ここでは「復元」の意味か
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "ウィンドウをすべて復元 (_M)"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "メッセージの一斉送信 (_E)"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "すべてのユーザーに"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "オンラインのすべてのユーザーに"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "招待 (_V)"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "相手先の管理 (_M)"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "グループの編集…(_G)"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "削除 (_R)"
 
 # (Mako)ここでは「復元」の意味か
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "ウィンドウの復元 (_M)"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 msgid "Re_name"
 msgstr "名前の変更 (_N)"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "再接続 (_R)"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "コマンドを実行"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "履歴 (_H)"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
-msgstr "履歴マネージャ"
+msgstr "履歴管理"
 
 # (Mako)承認なしに名簿にある状態
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "オブザーバー"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
 #: gajim/conversation_textview.py:63
-#, fuzzy
 msgid "Untrusted"
-msgstr "興味"
+msgstr "信用されない"
 
 #: gajim/conversation_textview.py:66
 msgid "Trust Not Decided"
@@ -1692,19 +1684,18 @@ msgstr ""
 
 #: gajim/conversation_textview.py:69
 msgid "Unverified"
-msgstr ""
+msgstr "未検証"
 
 #: gajim/conversation_textview.py:72
-#, fuzzy
 msgid "Verified"
-msgstr "検査 (_V)"
+msgstr "検証済"
 
 #: gajim/conversation_textview.py:321
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
-"この線より下の文は、このグループチャットを\n"
+"この線より下の文は、この談話室を\n"
 "最後に読んだとき以降に発生したものです"
 
 #: gajim/conversation_textview.py:518
@@ -1791,7 +1782,7 @@ msgstr "チャット"
 
 #: gajim/message_window.py:526
 msgid "Group Chats"
-msgstr "グループチャット"
+msgstr "談話室"
 
 #: gajim/message_window.py:530
 msgid "Private Chats"
@@ -1801,67 +1792,67 @@ msgstr "個人チャット"
 msgid "Messages"
 msgstr "メッセージ"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "%(url)s に対する HTTP (%(method)s) の承認 (ID: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "この申し込みを承認しますか ?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "この申し込み(アカウント %s)を承認しますか ?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 msgid "Authorization Request"
 msgstr "承認の要求"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 msgid "HTTP Authorization Request"
 msgstr "HTTP 承認の要求"
 
 # Auto の選択肢
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 msgid "_No"
 msgstr "しない (_N)"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s を送信する際にエラー ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "在席通知申込"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "承認が得られました"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "相手先 \"%s\" は、あなたが在席状況を見ることを承認しました。"
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 msgid "Subscription Removed"
 msgstr "在席通知を削除"
 
-#: gajim/gui_interface.py:354
-#, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
-msgstr "%s (%s) は、あなたからの申し込みを削除しました。"
+#: gajim/gui_interface.py:328
+#, python-format
+msgid "%(name)s (%(jid)s) has removed subscription from you"
+msgstr "%(name)s (%(jid)s) は、あなたからの申し込みを削除しました"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
@@ -1869,144 +1860,144 @@ msgstr ""
 "これらの相手先を常にオフラインとして見ることになります。\n"
 "相手先一覧から削除しますか ?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "在席通知の取り消し"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s は招待を断りました: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s は招待を断りました。"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "{user} さんより、{room} へ招待されました"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "証明書のパスフレーズが必要です"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "アカウント %s の証明書のパスフレーズを入力してください"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s のパスワードを入力してください"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "パスワードが必要です"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "パスワードを保存する"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "ファイル転送のエラー"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "ファイル転送の要求"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 msgid "Remote Contact Stopped Transfer"
 msgstr "向こうの相手先が転送を中止しました"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 msgid "Error Opening File"
 msgstr "ファイルを開く際のエラー"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 msgid "SSL Certificate Error"
 msgstr "SSL 証明書エラー"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "ファイルの転送の中断"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "ファイル転送に失敗しました"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(name)s さんからのファイル %(filename)s を受け取りました。"
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s さんからのファイル %(filename)s の転送を中断しました。"
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "%(name)s さんからのファイル %(filename)s の転送に失敗しました。"
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s さんへファイル %(filename)s を送りました。"
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(name)s さんへのファイル %(filename)s の転送を中断しました。"
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "%(name)s さんへのファイル %(filename)s の転送に失敗しました。"
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "ユーザー名の重複"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 msgid "Please enter a new username for your local account"
 msgstr "ローカルのアカウントの新しいユーザー名を入力してください"
 
 # (Mako)ほかの項目との並びで、バランスを考えてあえてカッコでつけ加えている
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "OK (_O)"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s さんがファイルを音声チャットを始めたがっています。"
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "音声チャットの要求"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 msgid "Insecure Connection"
 msgstr "安全でない接続"
 
-#: gajim/gui_interface.py:1009
-#, fuzzy, python-format
+#: gajim/gui_interface.py:970
+#, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
 "insecure connection method. This means conversations will not be encrypted. "
@@ -2016,19 +2007,19 @@ msgstr ""
 "ています。これは、会話が暗号化されないことを意味します。PLAIN 接続はまったく"
 "推奨しません。"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr "中断 (_A)"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 msgid "_Connect Anyway"
 msgstr "それでも接続 (_A)"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "設定を保存できませんでした"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr "Gajim: IPython コンソール"
 
@@ -2043,9 +2034,9 @@ msgid "Unread Events"
 msgstr "未読のイベント"
 
 #: gajim/dialog_messages.py:43
-#, fuzzy
 msgid "Read or acknowledge all pending events before removing this account."
-msgstr "このアカウントを削除する前にすべての保留イベントを読みます。"
+msgstr ""
+"このアカウントを削除する前にすべての保留イベントを読むか承認してください。"
 
 #: gajim/dialog_messages.py:48
 msgid "Invalid Form"
@@ -2213,16 +2204,16 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "アバターのアップロードに失敗しました"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "私信の送信に失敗しました"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
-"あなたが既にグループチャット \"%(room)s\" にいないか、あるいは \"%(nick)s\" "
-"さんがいません。"
+"あなたが既に談話室 \"%(room)s\" にいないか、あるいは \"%(nick)s\" さんがいま"
+"せん。"
 
 #: gajim/gajim_remote.py:55 gajim/common/exceptions.py:70
 msgid "D-Bus is not present on this machine or python module is missing"
@@ -2317,10 +2308,10 @@ msgstr ""
 "global status\" オプションの設定されたアカウントすべての優先順位を変更します"
 
 #: gajim/gajim_remote.py:118
-#, fuzzy
 msgid ""
 "Sends new chat message to a contact in the contact list. Account is optional."
-msgstr "相手先に注目させるためのメッセージを送信します"
+msgstr ""
+"相手先一覧にある相手先に新たにメッセージを送信します(アカウントは省略可)。"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
 msgid "XMPP Address of the contact that will receive the message"
@@ -2337,10 +2328,9 @@ msgid "if specified, the message will be sent using this account"
 msgstr "指定した場合、メッセージはこのアカウントを使って送られます"
 
 #: gajim/gajim_remote.py:127
-#, fuzzy
 msgid ""
 "Sends a chat message to someone on your contact list. Account is optional."
-msgstr "相手先に注目させるためのメッセージを送信します"
+msgstr "相手先一覧にある誰かにメッセージを送信します(アカウントは省略可)。"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2352,7 +2342,7 @@ msgstr "メッセージの件名"
 
 #: gajim/gajim_remote.py:138
 msgid "Sends new message to a group chat you've joined."
-msgstr "参加しているグループチャットに新しいメッセージを送信します。"
+msgstr "参加している談話室に新しいメッセージを送信します。"
 
 #: gajim/gajim_remote.py:140
 msgid "XMPP Address of the group chat that will receive the message"
@@ -2540,81 +2530,75 @@ msgstr ""
 "引数 \"%(arg)s\" が指定されていません。\n"
 "詳しくは \"%(basename)s help %(command)s\" と入力してください"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s はディレクトリです。ファイルでなければなりません"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, python-format
 msgid "Creating %s"
 msgstr "%s を作成中"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "未知の SSL エラー: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "新着の私信"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "%(nickname)s さんからの新着メッセージ"
 msgstr[1] "%(nickname)s さんから%(n_msgs)i件の未読メッセージ"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 msgid "New Group Chat Message"
 msgstr "新しい談話室メッセージ"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s さんの在席状況が変わりました"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s さんは現在 %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "相手先が在席状況を変更"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s さんがサインインしました"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "相手先がサインインしました"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s さんがサインアウトしました"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "相手先がサインアウトしました"
 
 # (Mako) %s はアカウントか
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
-#, fuzzy
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 msgid "Authentication failed"
-msgstr "\"%s\" の認証に失敗しました"
+msgstr "認証は失敗しました"
 
 #: gajim/common/config.py:76
 msgid ""
@@ -2681,56 +2665,20 @@ msgstr ""
 "します。"
 
 #: gajim/common/config.py:93
-msgid "Notification color for contacts signing in."
-msgstr "相手先のサインインの通知の色"
-
-#: gajim/common/config.py:94
-msgid "Notification color for contacts signing out."
-msgstr "相手先のサインアウトの通知の色"
-
-#: gajim/common/config.py:95
-msgid "Notification color for new message notification."
-msgstr "新着メッセージ通知の色。"
-
-#: gajim/common/config.py:96
-msgid "Notification color for file transfer request."
-msgstr "ファイル転送要求の通知の色。"
-
-#: gajim/common/config.py:97
-msgid "Notification color for file transfer errors."
-msgstr "ファイル転送エラーの通知の色。"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr "ファイル転送の中止または完了の通知の色"
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr "談話室への招待の通知の色"
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr "在席状況変更の通知の背景色"
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
-msgstr "折り畳む (アカウントやグループチャットの) 行の一覧 (空白で区切る)。"
+msgstr "折り畳む (アカウントや談話室の) 行の一覧 (空白で区切る)。"
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "デフォルト"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr "スペルチェックのための言語。"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2741,51 +2689,51 @@ msgstr ""
 "す。\n"
 "'never'(なし) - 時刻を印さない。"
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
-msgstr "有効にすると、ASCII感情アイコンを絵文字に置換します。"
+msgstr "有効の場合、ASCII感情アイコンを絵文字に置換します。"
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "* / _ の組を、書式指定の文字として扱います。"
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
 msgstr ""
-"真なら、*/_ を除去しません。たとえば *abc* は太字になりますが * * は除かれま"
-"せん。"
+"有効の場合、*/_ を除去しません。たとえば *abc* は太字になりますが * * は除か"
+"れません。"
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr ""
-"グループチャットで、ニックネーム補完 (タブ) を使うとき、ニックネームの後ろに"
-"つけ加えられる文字。"
+"談話室で、ニックネーム補完 (タブ) を使うとき、ニックネームの後ろにつけ加えら"
+"れる文字。"
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr ""
-"グループチャットで、希望したニックネームが他の誰かに使われていた場合、希望し"
-"たニックネームの後ろにつけ加えられる文字。"
+"談話室で、希望したニックネームが他の誰かに使われていた場合、希望したニック"
+"ネームの後ろにつけ加えられる文字。"
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
-"真なら、Gajim は相手先一覧を閉じる際にその位置を保存し、開く際にはその位置に"
-"復元戻します。"
+"有効の場合、Gajim は相手先一覧を閉じる際にその位置を保存し、開く際にはその位"
+"置に復元戻します。"
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr "ひとつのウィンドウの場合、相手先一覧を右側にします"
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -2797,48 +2745,49 @@ msgstr ""
 "参照してください (https://docs.python.org/3/library/time.html#time."
 "strftime)。"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "会話の中で、ニックネームの前に表示される文字列。"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "会話の中で、ニックネームの後に表示される文字列。"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
-msgstr "真なら、Gajim は相手先一覧ウィンドウのタイトルに * と [n] を付けます。"
+msgstr ""
+"有効の場合、Gajim は相手先一覧ウィンドウのタイトルに * と [n] を付けます。"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
 msgstr ""
 "チャットのタブまたはウィンドウを再び開いたとき、再現されるメッセージの数。"
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr "履歴を復元する際に遡る時間 (単位は分) 。-1 は制限なし。"
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
-"切断されてからグループチャットに自動で再参加を試みるまでの待機時間 (単位は"
-"秒)。0 は再参加しません。"
+"切断されてから談話室に自動で再参加を試みるまでの待機時間 (単位は秒)。0 は再参"
+"加しません。"
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "Ctrl+Enter をメッセージ送信として、Enter を改行とします。"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Ctrl+KeyUP で遡ることのできる行数 (過去に送ったメッセージ)。"
 
-#: gajim/common/config.py:165
-#, fuzzy, python-format
+#: gajim/common/config.py:156
+#, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
 "'WIKTIONARY' (which means use Wikitionary)."
@@ -2846,11 +2795,11 @@ msgstr ""
 "独自の辞書の URL (%%s を含めます。ここで %%s は語/フレーズです)。または、"
 "Wikitionary を使う場合は単に 'WIKTIONARY' としてください。"
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "チェックをつけると、Gajim を gajim-remote を使って遠隔操作できます。"
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
@@ -2858,23 +2807,23 @@ msgstr ""
 "個々のメッセージに時刻を印すのではない場合 ('print_time'==sometimes (時々))、"
 "時刻を印す時間間隔 (単位:分)。"
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
-msgstr "グループチャットのタブまたはウィンドウを閉じる前に確認を求めます。"
+msgstr "談話室のタブまたはウィンドウを閉じる前に確認を求めます。"
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 "タブのあるチャットウィンドウを閉じる前に、それがデータを失う操作であることの"
-"確認を求めます (チャット、私信、グループチャットは最小化されません)。"
+"確認を求めます (チャット、私信、談話室は最小化されません)。"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
@@ -2882,115 +2831,101 @@ msgstr ""
 "ローカルのインターフェースに加えて、アドレス変換 / ポートフォワーディングの場"
 "合にファイル転送に用いるホストの一覧 (コンマで区切る)。"
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規格で、KiB は 1024 バイト、KB は 1000 バイト。"
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "システムの通知エリアでイベントを通知します。"
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "会話がひとつだけのときもタブを表示するかどうか。"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "チャットウィンドウにタブつき帳面の縁を表示するかどうか。"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "タブに閉じるボタンを表示するかどうか。"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "新着のメッセージをポップアップ通知に表示するかどうか。"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
-msgstr "グループチャットで強調表示する語の一覧 (セミコロンで区切る)。"
+msgstr "談話室で強調表示する語の一覧 (セミコロンで区切る)。"
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
 "This setting is taken into account only if the notification area icon is "
 "used."
 msgstr ""
-"真なら、ウィンドウマネージャーの X ボタンがクリックされた場合に Gajim を終了"
-"します。この設定は通知アイコンが使用されているときのみ適用されます。"
+"有効の場合、ウィンドウマネージャーの X ボタンがクリックされた場合に Gajim を"
+"終了します。この設定は通知アイコンが使用されているときのみ適用されます。"
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
-"真なら、Gajim は X ボタンが押された際に、相手先一覧ウィンドウを最小化するので"
-"はなく、閉じます。"
+"有効の場合、Gajim は X ボタンが押された際に、相手先一覧ウィンドウを最小化する"
+"のではなく、閉じます。"
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"真なら、Gajim は未読メッセージのあるタブにアイコンを表示します。テーマに依存"
-"し、アイコンが動画のものもあります。"
-
-#: gajim/common/config.py:205
-#, fuzzy
+#: gajim/common/config.py:183
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
 "the contact name in the contact list window."
 msgstr ""
-"真なら、Gajim は相手先一覧ウィンドウの相手先の名前の下に在席状況メッセージを "
-"(それが空でなければ) 表示します。"
+"有効の場合、Gajim は相手先一覧ウィンドウの相手先の名前の下に在席状況メッセー"
+"ジを (それが空でなければ) 表示します。"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "相手先一覧でのアバターの表示位置。'left'(左)または 'right'(右)。"
 
-#: gajim/common/config.py:212
-#, fuzzy
+#: gajim/common/config.py:190
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
 "contact changes their status (and/or their status message)."
 msgstr ""
-"偽なら、相手先が在席状況や状況メッセージを変更しても、Gajim はチャットに在席"
-"状況を表示しません。"
+"無効の場合、相手先が在席状況や状況メッセージを変更しても、Gajim はチャットに"
+"在席状況を表示しません。"
 
-#: gajim/common/config.py:213
-#, fuzzy
+#: gajim/common/config.py:191
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
-msgstr "グループに参加できません"
+msgstr "デフォルト設定: 談話室への入退室ごとに状況メッセージを表示します。"
 
-#: gajim/common/config.py:214
-#, fuzzy
+#: gajim/common/config.py:192
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
-msgstr "グループに参加できません"
+msgstr ""
+"デフォルト設定: 談話室でユーザーのすべての状況変更(離席中、取り込み中など)の"
+"メッセージを表示します。"
 
-#: gajim/common/config.py:216
-#, fuzzy
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
-msgstr "システムのタスクバーに相手先一覧を表示しません。"
+msgstr "システムのタスクバーに相手先一覧ウィンドウを表示しません。"
 
-#: gajim/common/config.py:217
-#, fuzzy
+#: gajim/common/config.py:195
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
 "Window Managers) when holding pending events."
 msgstr ""
-"真なら、保留のイベントがある場合にウィンドウをフラッシュさせます (たいていの"
-"ウィンドウマネージャのデフォルトです)。"
+"有効の場合、保留のイベントがある場合にウィンドウをフラッシュさせます (たいて"
+"いのウィンドウマネージャのデフォルトです)。"
 
-#: gajim/common/config.py:221
-#, fuzzy
+#: gajim/common/config.py:199
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3008,11 +2943,10 @@ msgstr ""
 "'never'(なし) - すべてのメッセージはそれぞれのウィンドウに。\n"
 "'peracct'(アカウントごと) - それぞれのアカウントへのメッセージはそれぞれの"
 "ウィンドウに。\n"
-"'pertype'(種類ごと) - メッセージの種類(たとえばチャット、グループチャット)ご"
-"とにそれぞれのウィンドウに。"
+"'pertype'(種類ごと) - メッセージの種類(たとえばチャット、談話室)ごとにそれぞ"
+"れのウィンドウに。"
 
-#: gajim/common/config.py:222
-#, fuzzy
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3024,34 +2958,28 @@ msgstr ""
 "'never'(なし) - 相手先一覧を表示しない。\n"
 "'last_state'(以前の状態) - 以前の相手先一覧の表示状態のとおりにする。"
 
-#: gajim/common/config.py:223
-#, fuzzy
+#: gajim/common/config.py:201
 msgid "If enabled, Gajim displays the avatar in the chat window."
-msgstr "偽なら、チャットウィンドウにアバターは表示されません。"
+msgstr "有効の場合、チャットウィンドウにアバターを表示します。"
 
-#: gajim/common/config.py:224
-#, fuzzy
+#: gajim/common/config.py:202
 msgid "If enabled, pressing Esc closes a tab/window."
-msgstr "真なら、エスケープキーを押すことでタブまたはウィンドウを閉じます。"
+msgstr "有効の場合、エスケープキーを押すことでタブまたはウィンドウを閉じます。"
 
-#: gajim/common/config.py:225
-#, fuzzy
+#: gajim/common/config.py:203
 msgid "Hides the banner in a group chat window."
-msgstr "グループチャットのバナーを表示しません"
+msgstr "談話室のバナーを表示しません"
 
-#: gajim/common/config.py:226
-#, fuzzy
+#: gajim/common/config.py:204
 msgid "Hides the banner in a 1:1 chat window."
-msgstr "グループチャットのバナーを表示しません"
+msgstr "1対1チャットウィンドウのバナーを表示しません。"
 
-#: gajim/common/config.py:227
-#, fuzzy
+#: gajim/common/config.py:205
 msgid "Hides the group chat participants list in a group chat window."
-msgstr "グループチャットウィンドウで、在室者一覧を表示しません。"
+msgstr "談話室ウィンドウで、参加者一覧を表示しません。"
 
 # (Mako)chat は group chat のことか?
-#: gajim/common/config.py:228
-#, fuzzy
+#: gajim/common/config.py:206
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking as in the previous message."
@@ -3059,28 +2987,26 @@ msgstr ""
 "チャットで、前のメッセージと別の人の場合のみ、行の先頭にニックネームを表示し"
 "ます。"
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "連続するニックネームを統合する際の字下げ幅。"
 
-#: gajim/common/config.py:230
-#, fuzzy
+#: gajim/common/config.py:208
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
-msgstr "未読のものがない場合、Ctrl-Tab で次の入力タブに移動します。"
+msgstr ""
+"未読メッセージを含むタブがない場合、Ctrl+Tab で次の入力タブに移動します。"
 
-#: gajim/common/config.py:231
-#, fuzzy
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
-"相手先の遮断の確認のダイアログを表示するかどうか。空文字ならダイアログを表示"
-"しません。"
+"メタ相手先の作成時に確認のダイアログを表示するかどうか。空文字ならダイアログ"
+"を表示しません。"
 
-#: gajim/common/config.py:232
-#, fuzzy
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
@@ -3088,51 +3014,43 @@ msgstr ""
 "相手先の遮断の確認のダイアログを表示するかどうか。空文字ならダイアログを表示"
 "しません。"
 
-#: gajim/common/config.py:233
-#, fuzzy
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
-"真なら、アカウントの設定ウィンドウで、アカウントに負の優先順位を設定できま"
-"す。【注意】負の優先順位のままログインすると、サーバーからどんなメッセージも"
-"受信しません。"
+"有効の場合、アカウントの設定ウィンドウで、アカウントに負の優先順位を設定でき"
+"ます。【注意】負の優先順位のままログインすると、サーバーからどんなメッセージ"
+"も受信しません。"
 
-#: gajim/common/config.py:234
-#, fuzzy
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
-"真なら、Gajim はアカウントとグループの行にオンラインと総計の相手先の数を表示"
-"します。"
+"有効の場合、Gajim はアカウントとグループの行にオンラインと総計の相手先の数を"
+"表示します。"
 
-#: gajim/common/config.py:235
-#, fuzzy
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
-"真なら、チャットウィンドウが開いていない場合に、最新のメッセージをあなたに"
-"送った相手先をスクロールして選択します。"
+"有効の場合、チャットウィンドウが開いていない場合に、最新のメッセージをあなた"
+"に送った相手先をスクロールして選択します。"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "在籍情況変更ウィンドウを閉じるまでの活動停止の時間。"
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "表示された会話の最大行数。古いほうから削除されます。"
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "操作しない状態をチェックする時間間隔。"
-
-#: gajim/common/config.py:239
-#, fuzzy
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
@@ -3140,185 +3058,169 @@ msgstr ""
 "正当な URI スキーム。この一覧にあるスキームだけが“実際の”URIとして扱われます"
 "(mailto と xmpp は別)。"
 
-#: gajim/common/config.py:240
-#, fuzzy
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
-msgstr "真なら、グループチャットでの補完をシェルの自動補完のようにします。"
+msgstr "有効の場合、談話室での補完をシェルの自動補完のようにします。"
 
-#: gajim/common/config.py:244
-#, fuzzy
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
-msgstr ""
-"jingle の出力のビデオのフレームレート (オプション)。例: 10/1 または 25/2"
+msgstr "jingle の出力のビデオのフレームレート (省略可)。例: 10/1 または 25/2。"
 
-#: gajim/common/config.py:245
-#, fuzzy
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
-msgstr "jingle の出力のビデオの大きさ (オプション). 例: 320x240"
+msgstr "jingle の出力のビデオの大きさ (省略可)。 例: 320x240。"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
-msgstr ""
+msgstr "有効の場合、自分のウェブカメラの映像も表示します。"
 
-#: gajim/common/config.py:249
-#, fuzzy
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
-"真なら、Gajim は Jingle を使う際に STUN サーバーを利用しようとします。サー"
-"バーは \"stun_server\" オプションか、または XMPP サーバーによって与えられま"
+"有効の場合、Gajim は Jingle を使う際に STUN サーバーを利用しようとします。"
+"サーバーは 'stun_server' オプションか、または XMPP サーバーによって与えられま"
 "す。"
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr "Jingle を使う際に利用する STUN サーバー"
 
-#: gajim/common/config.py:251
-#, fuzzy
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
-"真なら、Gajim はグループチャットの参加者の分掌をステータスアイコンに色付き四"
-"角をつけて表示します。"
+"有効の場合、Gajim は談話室の参加者の分掌をステータスアイコンに色付き四角をつ"
+"けて表示します。"
 
-#: gajim/common/config.py:252
-#, fuzzy
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 "アカウントで正しいプロキシの設定がなされていない場合に、外向きの通信に使われ"
-"るプロキシ"
+"るプロキシ。"
 
-#: gajim/common/config.py:253
-#, fuzzy
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
-msgstr "真なら、Gajim は受信する注目メッセージを無視します (\"wizz\")。"
+msgstr "有効の場合、Gajim は受信する注目メッセージを無視します ('wizz')。"
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
-"真なら、Gajim は、最後に終了した際に開いていたチャットウィンドウを再び開きま"
-"す。"
+"有効の場合、Gajim は、最後に終了した際に開いていたチャットウィンドウを再び開"
+"きます。"
 
-#: gajim/common/config.py:255
-#, fuzzy
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
-"チェックをつけると、Gajim は、送ったメッセージが相手先に受信されたとき、アイ"
-"コンを表示します。"
-
-#: gajim/common/config.py:256
-#, fuzzy
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr "チャットウィンドウとウィンドウアイコンに小さなアバターを表示します"
+"有効の場合、Gajim は、送ったメッセージが相手先に受信されたとき、アイコンを表"
+"示します。"
 
-#: gajim/common/config.py:257
-#, fuzzy
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
-msgstr "真なら、Gajim はパスワードの保存にシステムのキーリングを使います。"
+msgstr "有効の場合、Gajim はパスワードの保存にシステムのキーリングを使います。"
 
-#: gajim/common/config.py:258
-#, fuzzy
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
-msgstr "真なら、Gajim は XEP-0146 コマンドを実行します。"
+msgstr "有効の場合、Gajim は XEP-0146 コマンドを実行します。"
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: システム 1: 有効化 0: 無効化"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr "「同期の制限」メニューの、1日あたりの制限値の選択肢"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
-msgstr ""
+msgstr "有効の場合、Gajim は談話室への参加の際にその題を表示します。"
 
-#: gajim/common/config.py:264
-#, fuzzy
+#: gajim/common/config.py:240
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
-msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
+msgstr ""
+"有効の場合、Gajim は相手先のチャット状態に応じて相手先の行に色を付けます。"
 
-#: gajim/common/config.py:265
-#, fuzzy
+#: gajim/common/config.py:241
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
-msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
+msgstr "有効の場合、相手先のチャット状態に応じてタブに色を付けます。"
 
-#: gajim/common/config.py:266
-#, fuzzy
+#: gajim/common/config.py:242
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
-msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
+msgstr "相手先の現在のチャット状態の説明をバナーに表示します。"
 
-#: gajim/common/config.py:267
-#, fuzzy
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
-"チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
-"disabled (通知しない) のいずれか。"
+"相手先に送信されるチャット状態通知。all (すべての状態)、composing_only (入力"
+"中のみ)、disabled (通知しない) のいずれか。"
 
-#: gajim/common/config.py:268
-#, fuzzy
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr ""
-"チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
-"disabled (通知しない) のいずれか。"
+"談話室に送信されるチャット状態通知。all (すべての状態)、composing_only (入力"
+"中のみ)、disabled (通知しない) のいずれか。"
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
-msgstr ""
+msgstr "API の選択。'http' または 'iq'"
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
-#, fuzzy
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
-msgstr "真なら、Gajim は XEP-0146 コマンドを実行します。"
+msgstr ""
+"有効の場合、Gajim はコマンドを実行します(/show, /sh, /execute, /exec)。"
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
-msgstr ""
+msgstr "談話室の名簿の幅(ピクセル)"
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "ブックマーク名"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
@@ -3326,7 +3228,7 @@ msgstr ""
 "在席状況に応じて優先順位を自動的に変更します。優先順位は 'autopriority_*' オ"
 "プションで定義します。"
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
@@ -3337,27 +3239,27 @@ msgstr ""
 "ションは 'restore_last_status' が無効のときのみ使われます"
 
 # (Mako) If enabled は If True であるべきだろう
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
-msgstr "真なら、最後に使われた在席状況を復元します。"
+msgstr "有効の場合、最後に使われた在席状況を復元します。"
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
-msgstr "真なら、相手先の承認の要求は自動的に了承されます。"
+msgstr "有効の場合、相手先の承認の要求は自動的に了承されます。"
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr ""
-"偽なら、このアカウントを無効にして、相手先一覧ウィンドウに表示しません。"
+"無効の場合、このアカウントを無効にして、相手先一覧ウィンドウに表示しません。"
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 msgid "Use an unencrypted connection to the server"
 msgstr "サーバーに非暗号化接続を用います"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
@@ -3365,88 +3267,81 @@ msgstr ""
 "暗号化されない接続の場合、パスワードを送る前に警告のダイアログを表示しま"
 "す。'warn'(警告する)、または 'none'(警告しない)。"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
-msgstr ""
+msgstr "無視する SSL エラーの一覧(スペースで区切る)"
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
-msgstr ""
+msgstr "接続方法: START TLS または DIRECT TLS または PLAIN"
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
-"記録を保存しない XMPP アドレスの一覧 (空白で区切る)。アカウント名も追加でき、"
-"そのアカウントについて記録を残しません。"
+"履歴を保存しない XMPP アドレスの一覧 (空白で区切る)。アカウント名も追加でき、"
+"そのアカウントについて履歴を残しません。"
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr "生存パケットを送ってから再接続を試みるまで待機する時間 (単位は秒)。"
 
-#: gajim/common/config.py:319
-#, fuzzy
+#: gajim/common/config.py:297
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
 "'file_transfer_proxies' option for file transfers."
 msgstr ""
-"チェックをつけると、Gajim はあなたの IP とプロキシを使います。プロキシはファ"
-"イル転送のために file_transfer_proxies オプションで定義します。"
+"有効の場合、Gajim はあなたの IP とプロキシを使います。プロキシはファイル転送"
+"のために file_transfer_proxies オプションで定義します。"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
-"真なら、Gajim は起動時にファイル転送プロキシが正常に機能するかテストを行いま"
-"す。Openfire のプロキシは (正常に機能する場合でも) このテストに失敗することが"
-"わかっています。"
+"有効の場合、Gajim は起動時にファイル転送プロキシが正常に機能するかテストを行"
+"います。Openfire のプロキシは (正常に機能する場合でも) このテストに失敗するこ"
+"とがわかっています。"
 
-#: gajim/common/config.py:332
-#, fuzzy
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
-"チェックをつけると、Gajim は、送ったメッセージが相手先に受信されたとき、アイ"
-"コンを表示します。"
+"有効の場合、Gajim は、送ったメッセージが相手先に受信されたとき、アイコンを表"
+"示します。"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Gajim が使用中の OS を通知することを許可します。"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim があなたの現地時間を通知することを許可します。"
 
-#: gajim/common/config.py:345
-#, fuzzy
+#: gajim/common/config.py:323
 msgid "Message that is sent to contacts you want to add."
-msgstr "追加する相手先に送られるメッセージ"
+msgstr "追加しようとする相手先に送られるメッセージ"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
 "your machine for file transfers."
 msgstr ""
-"真なら、Gajim は相手先がファイル転送を行うためにあなたのローカル IP アドレス"
-"を送信します。"
+"有効の場合、Gajim は相手先がファイル転送を行うためにあなたのローカル IP アド"
+"レスを送信します。"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 "次回の起動時にチャットウィンドウを開く XMPP アドレスの一覧 (空白で区切る)。"
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr "HTTP ファイルアップロード: HTTPS 検証を有効化。"
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
@@ -3454,151 +3349,146 @@ msgstr ""
 "チャットウィンドウへのファイルのドラッグアンドドロップで用いられる転送方"
 "法。'httpupload' (デフォルト)または 'jingle'。"
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr "POSH での証明書の検証を許します。"
 
-#: gajim/common/config.py:379
-#, fuzzy
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr ""
-"チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
-"disabled (通知しない) のいずれか。"
+"相手先に送信されるチャット状態通知。all (すべての状態)、composing_only (入力"
+"中のみ)、disabled (通知しない) のいずれか。"
 
-#: gajim/common/config.py:382
-#, fuzzy
+#: gajim/common/config.py:359
 msgid "The currently active encryption for that contact."
-msgstr "現在その相手先に適用する暗号化方式"
+msgstr "現在その相手先に適用する暗号化方式。"
 
-#: gajim/common/config.py:386
-#, fuzzy
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
-msgstr "この談話室でのすべてのメッセージについて通知が必要かどうか"
+msgstr "有効の場合、この談話室でのすべてのメッセージについて通知します。"
 
-#: gajim/common/config.py:387
-#, fuzzy
+#: gajim/common/config.py:364
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
-msgstr "グループに参加できません"
+msgstr ""
+"談話室のユーザーのすべての状況変更(離席中、取り込み中など)の状況メッセージを"
+"表示します。"
 
-#: gajim/common/config.py:388
-#, fuzzy
+#: gajim/common/config.py:365
 msgid "Show a status message for every join or leave in a group chat."
-msgstr "グループに参加できません"
+msgstr "談話室への入退室ごとに状況メッセージを表示します。"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
-msgstr ""
+msgstr "有効の場合、自動入室した際に談話室を相手席一覧の中に最小化します。"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
-msgstr ""
+msgstr "有効の場合、談話室を閉じた際に相手先一覧の中に最小化します。"
 
-#: gajim/common/config.py:391
-#, fuzzy
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr ""
-"チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
-"disabled (通知しない) のいずれか。"
+"談話室に送信されるチャット状態通知。all (すべての状態)、composing_only (入力"
+"中のみ)、disabled (通知しない) のいずれか。"
 
-#: gajim/common/config.py:394
-#, fuzzy
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
-"終了時にプラグインが有効化されるかどうか (これは Gajim の終了時に保存されま"
-"す)。このオプションをプラグインの有効化/無効化のために使用しないでください。"
-"代わりに GUI を使用してください。"
+"有効の場合、プラグインは起動時に有効化されます (これは Gajim の終了時に保存さ"
+"れます)。このオプションをプラグインの有効化/無効化のために使用しないでくださ"
+"い。代わりにプラグインウィンドウを使用してください。"
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "睡眠中"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "すぐに戻ります"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "数分後に戻ります。"
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "食事"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 msgid "I'm eating."
 msgstr "食事中です。"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "映画"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "ただいま映画鑑賞中です。"
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "仕事中"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "仕事中です。"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "電話中"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "電話中です。"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "外出中"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "出かけています。"
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "在席しています。"
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "チャットできます。"
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "すぐ戻ります。"
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "不在です。"
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "邪魔しないでください。"
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "バイバイ !"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "'muc_highlight_words' or your nickname is mentioned."
@@ -3606,123 +3496,110 @@ msgstr ""
 "談話室のメッセージに、'muc_highlight_words' で設定した語、またはあなたのニッ"
 "クネームが含まれる場合にサウンドを鳴らします。"
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 msgid "Sound to play when any group chat message arrives."
 msgstr "談話室のメッセージがあった際にサウンドを鳴らします。"
 
 # 固有名詞(プロキシ・サーバー The Onion Router)
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: gajim/common/const.py:247
-#, fuzzy
+#: gajim/common/const.py:280
 msgid "?Group chat name:Team"
-msgstr "なし"
+msgstr "チーム"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
-msgstr ""
+msgstr "プロジェクトについての議論"
 
-#: gajim/common/const.py:249
-#, fuzzy
+#: gajim/common/const.py:282
 msgid "?Group chat address:team"
-msgstr "グループチャットに対応"
+msgstr "team"
 
-#: gajim/common/const.py:250
-#, fuzzy
+#: gajim/common/const.py:283
 msgid "?Group chat name:Family"
-msgstr "グループチャットのメッセージの強調:"
+msgstr "家族"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
-msgstr ""
+msgstr "春の集い"
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
-msgstr ""
+msgstr "family"
 
-#: gajim/common/const.py:253
-#, fuzzy
+#: gajim/common/const.py:286
 msgid "?Group chat name:Vacation"
-msgstr "グループチャットへの招待"
+msgstr "休暇について"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
-msgstr ""
+msgstr "旅行の計画"
 
-#: gajim/common/const.py:255
-#, fuzzy
+#: gajim/common/const.py:288
 msgid "?Group chat address:vacation"
-msgstr "グループチャットへの招待"
+msgstr "vacation"
 
-#: gajim/common/const.py:256
-#, fuzzy
+#: gajim/common/const.py:289
 msgid "?Group chat name:Repairs"
-msgstr "グループチャットのブックマーク"
+msgstr "修理"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
-msgstr ""
+msgstr "ローカルのヘルプ談話室"
 
-#: gajim/common/const.py:258
-#, fuzzy
+#: gajim/common/const.py:291
 msgid "?Group chat address:repairs"
-msgstr "グループチャットに対応"
+msgstr "repairs"
 
-#: gajim/common/const.py:259
-#, fuzzy
+#: gajim/common/const.py:292
 msgid "?Group chat name:News"
-msgstr "なし"
+msgstr "ニュース"
 
-#: gajim/common/const.py:260
-#, fuzzy
+#: gajim/common/const.py:293
 msgid "?Group chat description:Local news and reports"
-msgstr "グループチャットの作成は制限されています。"
+msgstr "地域ニュースとレポート"
 
-#: gajim/common/const.py:261
-#, fuzzy
+#: gajim/common/const.py:294
 msgid "?Group chat address:news"
-msgstr "新しいグループチャット"
+msgstr "news"
 
-#: gajim/common/const.py:266
-#, fuzzy
+#: gajim/common/const.py:299
 msgid "Remote server not found"
-msgstr "サービスが見つかりませんでした"
+msgstr "リモートサーバーが見つかりませんでした"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
-msgstr ""
+msgstr "リモートサーバーの時間切れ"
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
-#, fuzzy
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
-msgstr "%s はグループチャットのサーバーではありません"
+msgstr "アドレスは談話室のサーバーのものではありません"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 msgid "Group chat already exists"
 msgstr "談話室は既に存在しています"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
 msgstr "談話室は存在しません"
 
-#: gajim/common/const.py:273
-#, fuzzy
+#: gajim/common/const.py:306
 msgid "Group chat is closed"
-msgstr "グループチャット"
+msgstr "談話資質は閉鎖されます"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr "このメッセージは OTR で暗号化されており、復号することができません。"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -3730,7 +3607,7 @@ msgstr ""
 "このメッセージは伝統的な OpenPGP で暗号化されており、復号することができませ"
 "ん。このようなメッセージを扱うには PGP プラグインをインストールしてください。"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
@@ -3739,922 +3616,915 @@ msgstr ""
 "ん。このようなメッセージを扱うには OpenPGP プラグインをインストールしてくださ"
 "い。"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr "このメッセージは %s で暗号化されており、復号することができません。"
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "家事"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "買い物"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "掃除"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "料理"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "修繕"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "皿洗い"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "洗濯"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "庭仕事"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "お使い"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "犬の散歩"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "飲み"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "ビール"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "コーヒー"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "茶"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "スナック菓子"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "朝食"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "夕食"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "昼食"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "運動"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "自転車"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "ダンス"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "ハイキング"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "ジョギング"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "スポーツ"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "ランニング"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "スキー"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "水泳"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "練習"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "身づくろい"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "温泉"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "歯磨き"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "整髪"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "髭剃り"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "風呂"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "シャワー"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "約束あり"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "停止中"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "休み"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "遠出"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "隠密"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "長期休暇"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "祈り"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "予定していた休暇"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "思索"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "趣味"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "釣り"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "ゲーム"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "外出"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "パーティ"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "読書"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "リハーサル"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "買い物"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "喫煙"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "交流"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "日向ぼっこ"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "テレビ"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "映画"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "話し中"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "直接会って"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "電話で"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "ビデオ電話で"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "旅行"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "通勤中"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "運転中"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "車の中"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "バスで"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "飛行機で"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "列車で"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "旅行中"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "徒歩で"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "コーディング中"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "会議中"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "勉強中"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "執筆中"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "恐"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "驚"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "慕"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "立腹"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "煩"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "心配"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "奮"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "恥"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "うんざり"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "勇"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "閑"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "疑"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "寒"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "信"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "混乱"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "黙"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "大満足"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "偏屈"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "狂"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "創造的"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "好奇"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "落胆"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "消沈"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "失望"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "嫌気"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "狼狽"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "取り乱し"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "当惑"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "妬み"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "興奮"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "浮わつき"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "挫折"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "(人に)感謝"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "悲嘆"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "不機嫌"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "罪"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "幸"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "希望"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "暑"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "控え目"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "傷心"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "空腹"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "傷つき"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "感銘"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "畏敬"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "恋愛"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "義憤"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "興味"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "酔"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "無敵"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "やきもち"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "孤独"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "失"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "幸運"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "卑劣"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "きまぐれ"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "神経質"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "中間"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "憤怒"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "非道"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "陽気"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "誇"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "癒"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "解放"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "後悔"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "そわそわ"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "悲"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "皮肉"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "満足"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "深刻"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "衝撃"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "はにかみ"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "病"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "眠い"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "自発的"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "重圧"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "強"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "驚"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "感謝"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "渇"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "疲"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "未定義"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "弱"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "迷惑"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "精度"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "高度"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "地区"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "方位"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "建物"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "国"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "国コード"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "データ"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "説明"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "誤差"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "階"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "緯度"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "市(区町村)"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "経度"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "郵便番号"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "州(県)"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "部屋"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "移動速度"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "町丁名・番地"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "その他の情報"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "日付・時刻"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "発行者の証明書を取得できません"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "証明書失効リストを取得できません"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "証明書の署名を復号できません"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "証明書失効リストの署名を復号できません"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "発行者の公開鍵を復元できません"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "証明書の署名の失敗"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "証明書失効リストの署名の失敗"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "証明書は検証されていません"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "証明書は期限切れです"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "証明書失効リストは検証されていません"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "証明書失効リストは有効期限が切れています"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "証明書の notBefore (有効期限の始め)の書式のエラー"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "証明書の notAfter (有効期限の終わり)の書式のエラー"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "証明書失効リストの最終更新の書式のエラー"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "証明書失効リストの次回更新の書式のエラー"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "自己署名証明書"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "認証パス中の自己署名証明書"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "ローカルの発行者の証明書を取得できません"
 
 # (Mako)The first は root のことか?
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "ルート証明書が検証できません"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "認証パスが長すぎます"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "証明書は失効しています"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "検証されない認証局証明書"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "パスの長さの制限を越えています"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "証明書の目的はサポートされていません"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
-msgstr "証明書は信頼できません"
+msgstr "証明書は信用できません"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "証明書は却下されました"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "サブジェクトの発行者が合致しません"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "機関とサブジェクトの鍵IDが合致しません"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "機関と発行者シリアル番号が合致しません"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "証明書署名に鍵の使い方が含まれていません"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "アプリケーションの検証に失敗しました"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
-msgstr ""
+msgstr "署名している証明機関が不明です"
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 msgid "The certificate has been revoked"
 msgstr "証明書は失効しています"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
-msgstr ""
+msgstr "証明書はサイトと一致しません"
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
-msgstr ""
+msgstr "証明書のアルゴリズムは安全ではありません"
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
-msgstr ""
+msgstr "証明書の有効期間はまだ先です"
 
-#: gajim/common/const.py:856
-#, fuzzy
+#: gajim/common/const.py:889
 msgid "Unknown validation error"
-msgstr "未知の SSL エラー: %d"
+msgstr "未知の検証エラー"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 msgid "The certificate has expired"
 msgstr "証明書は期限切れです"
 
-#: gajim/common/const.py:901
-#, fuzzy
+#: gajim/common/const.py:934
 msgid "Authentication aborted"
-msgstr "承認が得られました"
+msgstr "認証は中断しました"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 msgid "Account disabled"
 msgstr "アカウントは無効です"
 
-#: gajim/common/const.py:903
-#, fuzzy
+#: gajim/common/const.py:936
 msgid "Credentials expired"
-msgstr "Oauth2 信任状"
+msgstr "認証情報は期限切れです"
 
-#: gajim/common/const.py:904
-#, fuzzy
+#: gajim/common/const.py:937
 msgid "Encryption required"
-msgstr "暗号化のエラー"
+msgstr "暗号化が必要です"
 
-#: gajim/common/const.py:908
-#, fuzzy
+#: gajim/common/const.py:941
 msgid "Authentication mechanism not supported"
-msgstr "拡張はサポートされていません"
+msgstr "この認証メカニズムに対応していません"
 
-# (Mako) %s はアカウントか
-#: gajim/common/const.py:909
-#, fuzzy
+#: gajim/common/const.py:942
 msgid "Authentication mechanism too weak"
-msgstr "\"%s\" の認証に失敗しました"
+msgstr "認証メカニズムが弱すぎます"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
-msgstr ""
+msgstr "今のところ認証できません"
 
 #: gajim/common/logging_helpers.py:31
 #, python-format
@@ -4703,22 +4573,22 @@ msgstr "V4L2: %s"
 
 #: gajim/common/multimedia_helpers.py:111
 msgid "X11"
-msgstr ""
+msgstr "X11"
 
 #: gajim/common/multimedia_helpers.py:113
 msgid "Windows"
-msgstr ""
+msgstr "Windows"
 
 #: gajim/common/multimedia_helpers.py:115
 msgid "macOS"
-msgstr ""
+msgstr "macOS"
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s 設定エラー"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4737,293 +4607,252 @@ msgstr ""
 "エラー:\n"
 "%(error)s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "音声入力"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "音声出力"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "ビデオ入力"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "サーバー名は1文字以上1023文字以下にしてください"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "ホスト名に不正な文字が含まれています。"
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "サーバーのアドレスが必要です。"
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "ユーザー名は1文字以上1023文字以下にしてください"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "ユーザー名に不正な文字が含まれています。"
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "リソースは1文字以上1023文字以下にしてください"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "リソースに不正な文字が含まれています。"
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "取り込み中 (_B)"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "取り込み中"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "不在 (_N)"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "不在"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "チャット可 (_F)"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "チャット可"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "在席 (_A)"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "在席"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "接続中です"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "離席中 (_W)"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "離席中"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "オフライン (_O)"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "オフライン"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "エラーが起こっています"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "なし"
 
 # (Mako)subscription
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "相手先が承認"
 
 # (Mako)groups_post_window.ui は、メールの「差出人」に相当
 # helpers.pyは、
 # 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "こちらが承認"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "相互に承認"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 msgid "Unknown"
 msgstr "不明"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "なし"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "申し込み"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "なし"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "司会者"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "司会者"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "参加者"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "参加者"
 
 # (Mako)moderated room で、発言権(voice)を持たない者
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "傍聴者"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "傍聴者"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "なし"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 msgid "Owners"
 msgstr "主宰者"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "主宰者"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 msgid "Administrators"
 msgstr "管理人"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "管理人"
 
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 msgid "Members"
 msgstr "メンバー"
 
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "メンバー"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "さんはこの会話に目を向けています"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "さんは何かほかのことをしています"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 msgid "is composing a message…"
 msgstr "さんはメッセージを書いています…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "さんは書く手をちょっと止めています"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "さんはチャットウインドウを閉じました"
 
 # (Mako)これと、次の "from room %s" は連続して表示される
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "保留メッセージ %d 件"
 msgstr[1] "保留メッセージ %d 件"
 
-#: gajim/common/helpers.py:929
-#, fuzzy, python-format
+#: gajim/common/helpers.py:749
+#, python-format
 msgid "from group chat %s"
-msgstr "グループチャットで (_G)"
+msgstr "談話室 %s より"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr " - ユーザー %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "- %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "保留イベント %d 件"
 msgstr[1] "保留イベント %d 件"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "あなたを私の相手先リストに追加したいと思います。"
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "こんにちは。私は $name です。"
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "画像の読み込みに失敗しました"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "画像が大きすぎます"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "pyCURL がインストールされていません"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "画像読み込みエラー"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s はファイルです。ディレクトリでなければなりません"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim は終了します"
 
@@ -5125,82 +4954,82 @@ msgstr "コンピューターを終了しています"
 msgid "Disconnect from the network"
 msgstr "ネットワークから切断"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "あなたを私の相手先一覧に追加したいと思っています。"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "ファイルが空です"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "ファイルがありません"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr "ファイルが大きすぎます。最大ファイルサイズ: %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 msgid "Encrypting file…"
 msgstr "ファイルを暗号化…"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr "HTTP ファイルアップロード枠を要求しています…"
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr "「HTTP ファイルアップロード」でアップロードしています…"
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "在席状況の変更"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "在席状況を変更する"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "在席状況の種類と説明の設定"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "チャットできます"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "オンライン"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "長時間不在です"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "邪魔しないでください"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "オフライン - 切断中"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "在席状況の説明:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "在席状況が変更されました。"
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "送った相手先: \"%(jid)s\" (%(name)s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "送った相手先:"
 
@@ -5220,20 +5049,20 @@ msgstr "Gajim 起動時にこの談話室に参加する"
 
 #: gajim/data/gui/join_groupchat_window.ui:113
 msgid "Join Automatically"
-msgstr ""
+msgstr "自動で参加"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "アカウント"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 msgid "Group chat"
-msgstr "グループチャット"
+msgstr "談話室"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 msgid "Password"
 msgstr "パスワード"
 
@@ -5247,13 +5076,13 @@ msgstr "ブックマーク"
 
 #: gajim/data/gui/join_groupchat_window.ui:339
 msgid "Recently used group chats"
-msgstr "最近使ったグループチャット"
+msgstr "最近使った談話室"
 
 #: gajim/data/gui/join_groupchat_window.ui:360
 msgid "Search group chats on selected server"
 msgstr "選択したサーバーで談話室を検索"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
 msgstr "参加"
 
@@ -5267,20 +5096,20 @@ msgstr "速度"
 
 #: gajim/data/gui/filetransfer_progress.ui:140
 msgid "Time remaining"
-msgstr ""
+msgstr "残り時間"
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "中止 (_C)"
 
@@ -5366,17 +5195,17 @@ msgstr "在席状況 (_S)"
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:188
 msgid "Common Name (CN)"
-msgstr ""
+msgstr "一般名 (CN)"
 
 #: gajim/data/gui/certificate_dialog.ui:95
 #: gajim/data/gui/certificate_dialog.ui:217
 msgid "Organization (O)"
-msgstr ""
+msgstr "組織 (O)"
 
 #: gajim/data/gui/certificate_dialog.ui:124
 #: gajim/data/gui/certificate_dialog.ui:246
 msgid "Organizational Unit (OU)"
-msgstr ""
+msgstr "部門 (OU)"
 
 #: gajim/data/gui/certificate_dialog.ui:153
 msgid "Serial Number"
@@ -5384,12 +5213,11 @@ msgstr "シリアル番号"
 
 #: gajim/data/gui/certificate_dialog.ui:275
 msgid "Issued on"
-msgstr ""
+msgstr "自"
 
 #: gajim/data/gui/certificate_dialog.ui:304
-#, fuzzy
 msgid "Expires on"
-msgstr "保管期限"
+msgstr "至"
 
 #: gajim/data/gui/certificate_dialog.ui:333
 msgid "SHA-1"
@@ -5397,32 +5225,31 @@ msgstr "SHA-1"
 
 #: gajim/data/gui/certificate_dialog.ui:348
 msgid "Issued to"
-msgstr ""
+msgstr "証明対象"
 
 #: gajim/data/gui/certificate_dialog.ui:364
 msgid "Issued by"
-msgstr ""
+msgstr "証明者"
 
 #: gajim/data/gui/certificate_dialog.ui:380
 msgid "Validity"
-msgstr ""
+msgstr "有効期間"
 
 #: gajim/data/gui/certificate_dialog.ui:396
 msgid "Fingerprints"
-msgstr ""
+msgstr "指紋"
 
 #: gajim/data/gui/certificate_dialog.ui:431
 msgid "SHA-256"
 msgstr "SHA-256"
 
 #: gajim/data/gui/certificate_dialog.ui:465
-#, fuzzy
 msgid "Copy Certificate Information"
-msgstr "相手先の情報"
+msgstr "証明書の情報をコピー"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "説明"
 
@@ -5601,47 +5428,51 @@ msgstr "職業"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "概略"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
-#, fuzzy
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 msgid "Global Group Chat Search"
-msgstr "グループチャットに参加"
+msgstr "全体的な談話室検索"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
-#, fuzzy
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 msgid "_Back"
-msgstr "すぐに戻ります"
+msgstr "戻る (_B)"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "参加 (_J)"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
 msgstr "アカウントを選択"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr "選択 (_S)"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
 msgstr ""
+"相手先が見つかりませんでした。\n"
+"XMPP アドレスを入力できます"
 
 #: gajim/data/gui/filetransfers.ui:21
-#, fuzzy
 msgid "Pa_use/Resume"
-msgstr "残す (_R)"
+msgstr "一時中断/再開 (_U)"
 
 # #(Mako)Containing をどうする
 #: gajim/data/gui/filetransfers.ui:45
@@ -5650,7 +5481,7 @@ msgstr "フォルダを開く (_O)"
 
 #: gajim/data/gui/filetransfers.ui:56 gajim/data/gui/filetransfers.ui:206
 msgid "File Transfers"
-msgstr "ファイルの転送"
+msgstr "ファイル転送"
 
 #: gajim/data/gui/filetransfers.ui:94
 msgid "_Show notification when file transfer is complete"
@@ -5669,9 +5500,8 @@ msgid "Remove completed, cancelled and failed file transfers from the list"
 msgstr "一覧から、完了・中止・失敗したファイル転送を削除します"
 
 #: gajim/data/gui/filetransfers.ui:170
-#, fuzzy
 msgid "Pause or resume file transfer"
-msgstr "ファイルの転送を中止する"
+msgstr "ファイルの転送を一時中断または再開します"
 
 #: gajim/data/gui/filetransfers.ui:183
 msgid "Cancel the selected file transfer and remove incomplete files"
@@ -5698,6 +5528,7 @@ msgid "Strike"
 msgstr "抹消線"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "色"
 
@@ -5709,121 +5540,114 @@ msgstr "フォント"
 msgid "Clear formatting"
 msgstr "書式の解除"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 msgid "Choose encryption"
 msgstr "暗号化方式を選択"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 msgid "Show a list of emojis (Alt+M)"
 msgstr "絵文字の一覧を表示する (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 msgid "Joining…"
 msgstr "参加中…"
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 msgid "Enter new nickname"
 msgstr "新しいニックネームを入力してください"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 msgid "Ch_ange"
 msgstr "変更 (_A)"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "談話室の題を変更"
+
+#: gajim/data/gui/groupchat_control.ui:786
 msgid "Enter password"
 msgstr "新しいパスワードを入力してください:"
 
-#: gajim/data/gui/groupchat_control.ui:958
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1003
 msgid "_Leave Group Chat"
-msgstr "グループチャットから退出"
+msgstr "談話室から退出 (_L)"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
-msgstr "チェックをつけると、起動時にこのグループチャットに参加します"
+msgstr "チェックをつけると、起動時にこの談話室に参加します"
 
-#: gajim/data/gui/groupchat_control.ui:1018
-#, fuzzy
-msgid "An error occured"
-msgstr "<b>エラーが発生しました:</b>"
+#: gajim/data/gui/groupchat_control.ui:1063
+msgid "An error occurred"
+msgstr "エラーが発生しました"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr "再試行 (_T)"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 msgid "Kick participant"
 msgstr "参加者を蹴り出す"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "蹴り出し (_K)"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr "絵文字を挿入"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
-msgstr "理由 (任意)"
+msgstr "理由 (省略可)"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 msgid "Ban participant"
 msgstr "参加者を締め出す"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "締め出し (_B)"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 msgid "Destroy group chat"
-msgstr "グループチャットを閉鎖"
+msgstr "談話室を閉鎖"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 msgid "_Destroy"
 msgstr "閉鎖 (_D)"
 
-#: gajim/data/gui/groupchat_control.ui:1555
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
-msgstr "また、代替の談話室を入力できます:"
+msgstr "また、代替の場所(省略可)…"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 msgid "Reason (optional)..."
-msgstr "理由 (任意)..."
+msgstr "理由 (省略可)…"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
-msgstr ""
+msgstr "閉鎖の理由"
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
 msgstr "談話室の新しい名前を入力してください"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 msgid "_Invite"
 msgstr "招待 (_I)"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "イベントの種類"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "イベントの説明"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -5907,18 +5731,18 @@ msgid "Add"
 msgstr "追加"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 msgid "Remove"
 msgstr "削除"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 msgid "Resource"
 msgstr "リソース"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "在席状況"
 
@@ -5927,14 +5751,13 @@ msgid "Client"
 msgstr "クライアント"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "システム"
 
 #: gajim/data/gui/vcard_information_window.ui:140
-#, fuzzy
 msgid "Contact time"
-msgstr "名前"
+msgstr "会話時間"
 
 #: gajim/data/gui/vcard_information_window.ui:240
 msgid "User avatar"
@@ -5951,9 +5774,8 @@ msgstr "要求"
 
 #. Family Name
 #: gajim/data/gui/vcard_information_window.ui:304
-#, fuzzy
 msgid "Subscription"
-msgstr "在席通知の承認:"
+msgstr "在席通知申込"
 
 #: gajim/data/gui/vcard_information_window.ui:973
 #: gajim/data/gui/vcard_information_window.ui:992
@@ -5987,9 +5809,8 @@ msgid "Notify me about it"
 msgstr "それについて通知する"
 
 #: gajim/data/gui/preferences_window.ui:58
-#, fuzzy
 msgid "Show only in contact list"
-msgstr "アクティブな相手先のみ表示"
+msgstr "相手先一覧にのみ表示"
 
 #: gajim/data/gui/preferences_window.ui:69
 msgid "Detached contact list with detached chats"
@@ -6012,14 +5833,12 @@ msgid "Detached contact list with chat grouped by type"
 msgstr "相手先一覧は別ウィンドウ、チャットは種類でまとめたウィンドウ"
 
 #: gajim/data/gui/preferences_window.ui:92
-#, fuzzy
 msgid "No status messages"
-msgstr "状況メッセージ"
+msgstr "状況メッセージがありません"
 
 #: gajim/data/gui/preferences_window.ui:95
-#, fuzzy
 msgid "All status messages"
-msgstr "状況メッセージ"
+msgstr "すべての状況メッセージ"
 
 #: gajim/data/gui/preferences_window.ui:98
 #, fuzzy
@@ -6060,100 +5879,105 @@ msgstr "ウィンドウの配置 (_W)"
 msgid "_Show contact list on startup"
 msgstr "起動時に相手先一覧を表示する (_S)"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr "チャットのタブにアバターを表示する"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr "チェックをつけると、チャットのタブに相手先のアバターを表示します"
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr "タブの位置 (_T)"
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr "相手先一覧を閉じると Gajim を終了する (_Q)"
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
+"有効の場合、相手先一覧ウィンドウが閉じられた際、システム通知エリアに最小化せ"
+"ずに、Gajim を終了します。"
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
-msgstr ""
+msgstr "ウィンドウをタブの配置"
+
+#: gajim/data/gui/preferences_window.ui:403
+msgid "Me_rge accounts"
+msgstr "アカウントを統合 (_R)"
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr "すべてのアカウントを一つに統合して表示します"
+
+#: gajim/data/gui/preferences_window.ui:421
 msgid "Show a_vatars of contacts in contact list"
 msgstr "相手先一覧に相手先のアバターを表示する (_V)"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
 "in group chats"
 msgstr ""
-"チェックをつけると、Gajim は相手先一覧ウィンドウとグループチャットに相手先の"
-"アバターを表示します"
+"チェックをつけると、Gajim は相手先一覧ウィンドウと談話室に相手先のアバターを"
+"表示します"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 msgid "Show status _messages of contacts in contact list"
 msgstr "相手先一覧に相手先の状況メッセージを表示する (_M)"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
 "name, in the contact list window, and in group chats"
 msgstr ""
-"チェックをつけると、Gajim は相手先一覧ウィンドウとグループチャットの相手先名"
-"の下に状況メッセージを表示します"
+"チェックをつけると、Gajim は相手先一覧ウィンドウと談話室の相手先名の下に状況"
+"メッセージを表示します"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "相手先の詳細情報(気分、動向…)を相手先一覧に表示する (_X)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
+"チェックをつけると、相手先が公表する詳細情報を相手先一覧に表示します。(PEPに"
+"よって公表される)詳細情報とはたとえば気分、動向、楽曲、位置……です。"
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "相手先を在席状況順に並べる"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 msgid "in _contact list"
 msgstr "相手先一覧で (_C)"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
-msgstr "グループチャットで (_G)"
+msgstr "談話室で (_G)"
 
-#: gajim/data/gui/preferences_window.ui:540
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:538
 msgid "Contact List Appearance"
-msgstr "相手先一覧の項目の交換"
+msgstr "相手先一覧の外観"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
-msgstr ""
+msgstr "自動コピーを有効化する"
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
+"有効の場合、選択したテキストはクリップボードにコピーされます。そうでない場"
+"合、CTRL + SHIFT + C でコピーできます。"
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
-msgstr "スペルチェックを有効化 (_C)"
+msgstr "スペルチェックを有効化する (_C)"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6162,235 +5986,225 @@ msgid ""
 msgstr ""
 "チェックをつけると、Gajim はチャットウィンドウの入力欄でスペルの間違いを強調"
 "して表示します。入力欄での右クリックで言語を明示的に指定できますが、それがな"
-"い場合は、この相手先やグループチャットにはデフォルトの言語が適用されます。"
-"gspell のインストールが必要です。"
+"い場合は、この相手先や談話室にはデフォルトの言語が適用されます。gspell のイン"
+"ストールが必要です。"
 
-#: gajim/data/gui/preferences_window.ui:658
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:656
 msgid "Show message recei_pts (✔)"
-msgstr "メッセージの内容"
+msgstr "メッセージ受領 (✔) を表示する"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
+"チェックをつけると、個々のメッセージの後に、それが受け取られた際に小さな"
+"チェックマークを付けます。ただし、すべてのクライアントがこれに対応しているわ"
+"けではなく、そのため誤解を生じることがあることに注意してください。"
 
-#: gajim/data/gui/preferences_window.ui:676
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:674
 msgid "_Show XHTML formatting"
-msgstr "書式の一覧を表示する"
+msgstr "XHTML 形式を表示する (_S)"
 
-#: gajim/data/gui/preferences_window.ui:693
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:691
 msgid "Display status messages in _single chats"
-msgstr "名簿に相手先の状況メッセージを表示する (_M)"
+msgstr "1対1チャットで相手先の状況メッセージを表示する (_S)"
 
-#: gajim/data/gui/preferences_window.ui:697
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
 msgstr ""
-"偽なら、相手先が在席状況や状況メッセージを変更しても、Gajim はチャットに在席"
-"状況を表示しません。"
+"チェックをつけると、相手先が在席状況や状況メッセージを変更した際、1対1チャッ"
+"トに在席状況を表示します"
 
-#: gajim/data/gui/preferences_window.ui:711
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:709
 msgid "Show subject after _joining a group chat"
-msgstr "グループに参加できません"
+msgstr "談話室に参加したとき、題を表示する (_J)"
 
-#: gajim/data/gui/preferences_window.ui:715
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:713
 msgid "If checked, the subject will be shown when joining a group chat"
-msgstr "グループに参加できません"
+msgstr "チェックをつけると、談話室に参加する際に題を表示します"
 
-#: gajim/data/gui/preferences_window.ui:737
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:735
 msgid "Group Chat Settings"
-msgstr "チャットのショートカット"
+msgstr "談話室の設定"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
-msgstr ""
+msgstr "入室/退室を表示 (デフォルト)"
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
+"談話室で入室／退室メッセージを表示するか。この設定は談話室メニューで上書きさ"
+"れることがあります。"
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:817
 msgid "Show status changes (Default)"
-msgstr "相手先の状況変更を記録する (_S)"
+msgstr "状況変更を表示 (デフォルト)"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
+"談話室で状況変更メッセージを表示するか。この設定は談話室メニューで上書きされ"
+"ることがあります。"
 
-#: gajim/data/gui/preferences_window.ui:880
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:878
 msgid "Show chatstate in tabs"
-msgstr "タブに閉じるボタンを表示するかどうか。"
+msgstr "チャット状態をタブに表示する"
 
-#: gajim/data/gui/preferences_window.ui:884
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:882
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
-msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
+msgstr ""
+"チェックをつけると、相手先の現在のチャット状態に応じてタブに色を付けます"
 
-#: gajim/data/gui/preferences_window.ui:898
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:896
 msgid "Show chatstate in contact list"
-msgstr "タブに閉じるボタンを表示するかどうか。"
+msgstr "チャット状態を相手先一覧に表示する"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
+"チェックをつけると、相手先の現在のチャット状態に応じて、相手先の行に色を付け"
+"ます"
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
-msgstr ""
+msgstr "チャット状態をバナーに表示する"
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"チェックをつけると、相手先の現在のチャット状態の説明をバナーに表示します"
 
 # 起動時に名簿を表示するか
-#: gajim/data/gui/preferences_window.ui:940
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:938
 msgid "Chatstate"
-msgstr "以前の状態"
+msgstr "チャット状態"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "チャット"
 
-#: gajim/data/gui/preferences_window.ui:1011
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1009
 msgid "Show _notification area icon"
-msgstr "通知エリアのアイコンの表示"
+msgstr "通知エリアのアイコンを表示する (_N)"
 
-#: gajim/data/gui/preferences_window.ui:1030
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1028
 msgid "_When new event is received"
-msgstr "新しいイベントを受信したとき"
+msgstr "新しいイベントを受信したとき (_W)"
 
-#: gajim/data/gui/preferences_window.ui:1071
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1069
 msgid "Show popups/notifications when a chat window is already _open"
-msgstr "チャットウィンドウが開いているとき、ポップアップや通知を許可する"
+msgstr "チャットウィンドウが開いているときでも、ポップアップや通知を表示する"
 
-#: gajim/data/gui/preferences_window.ui:1088
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1086
 msgid "Allow popups/notifications when I'm _away, not available or busy"
-msgstr ""
-"離席/不在/取り込み中/居ないふりのとき、ポップアップや通知を許可する (_A)"
+msgstr "離席中/不在/取り込み中のとき、ポップアップや通知を許可する (_A)"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "相手先のサインインを通知する (_I)"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
+"相手先のサインインについて画面の右下にポップアップウィンドウを表示します"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "相手先のサインアウトを通知する (_O)"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
+"相手先のサインアウトについて画面の右下にポップアップウィンドウを表示します"
 
-#: gajim/data/gui/preferences_window.ui:1146
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
-msgstr "<b>目への通知</b>"
+msgstr "目への通知"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "サウンドを鳴らす (_S)"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "設定...(_N)"
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr "取り込み中でもサウンドを鳴らす (_B)"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 msgid "Sounds"
 msgstr "サウンド"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "通知"
 
-#: gajim/data/gui/preferences_window.ui:1289
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1287
 msgid "No_t Available"
-msgstr "不在"
+msgstr "不在 (_T)"
 
-#: gajim/data/gui/preferences_window.ui:1293
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
-"チェックをつけると、Gajim はコンピューターが長い間使われていないとき、在席状"
-"況を「不在」に変更します"
+"チェックをつけると、Gajim はコンピューターが一定時間使われていないとき、在席"
+"状況を「不在」に変更します"
 
-#: gajim/data/gui/preferences_window.ui:1310
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
-"チェックをつけると、Gajim はコンピューターが長い間使われていないとき、在席状"
-"況を「不在」に変更します"
+"チェックをつけると、Gajim はコンピューターが一定時間使われていないとき、在席"
+"状況を「離席中」に変更します"
 
-#: gajim/data/gui/preferences_window.ui:1356
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
 "$S will be replaced by previous status message.\n"
 "$T will be replaced by auto-away timeout."
 msgstr ""
-"自動「離席」メッセージ。空にすると、Gajim は現在の状況メッセージを変更しませ"
-"ん。\n"
+"自動「離席中」メッセージ。空にすると、Gajim は現在の状況メッセージを変更しま"
+"せん。\n"
 "$S は前の状況メッセージに置き換えられます\n"
 "$T は自動離席の設定時間に置き換えられます"
 
-#: gajim/data/gui/preferences_window.ui:1371
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6398,234 +6212,235 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 "自動「不在」メッセージ。空にすると、Gajim は現在の状況メッセージを変更しませ"
-"ん\n"
-"$S は前の状況メッセージに置き換えられます\n"
-"$T は自動不在の設定時間に置き換えられます"
+"ん。\n"
+"$S は前の状況メッセージに置き換えられます。\n"
+"$T は自動不在の設定時間に置き換えられます。"
 
-#: gajim/data/gui/preferences_window.ui:1385
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1383
 msgid "Minutes"
-msgstr "分後"
+msgstr "時間(分)"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 msgid "Automatic Status"
 msgstr "在席状況の自動変更"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
-msgstr ""
+msgstr "最後の状況を記憶し復元する (_R)"
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
+"チェックをつけると、最後のセッションで用いられた状況と状況メッセージを復元し"
+"ます"
 
 # (Mako)語順が難しい
-#: gajim/data/gui/preferences_window.ui:1486
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1484
 msgid "Ask for status message when I"
 msgstr "状況メッセージを求めるのは、私が "
 
 # (Mako)"Ask status message when I:" に続く語
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "サインインしたとき (_I)"
 
 # (Mako)"Ask status message when I:" に続く語
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "サインアウトしたとき (_O)"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
-"チェックをつけると、Gajim は状況メッセージを要求しません。かわりに対応するデ"
-"フォルトのメッセージが使われます。"
+"有効の場合、Gajim は状況メッセージを要求しません。かわりに対応するデフォルト"
+"のメッセージが使われます。"
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "デフォルトのメッセージ"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "有効"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 msgid "Status Messages"
 msgstr "状況メッセージ"
 
-#: gajim/data/gui/preferences_window.ui:1755
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
-msgstr "<b>用意された状況メッセージ</b>"
+msgstr "状況メッセージを事前設定"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 msgid "Themes"
 msgstr "テーマ"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 msgid "_Theme"
 msgstr "テーマ (_T)"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "色とフォントの調整"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 msgid "_Dark Theme"
 msgstr "ダークテーマ (_D)"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr "絵文字"
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 msgid "_Emoji Theme"
 msgstr "絵文字テーマ (_E)"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr "アイコン"
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 msgid "_Status iconset"
 msgstr "状況アイコンセット (_S)"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 msgid "Use transports _icons"
 msgstr "中継先のアイコンを使う (_I)"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
 "ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)"
 msgstr ""
 "チェックをつけると、Gajim はプロトコル特有の在席状況アイコンを使用します "
-"(例: ICQ からの相手先にはオンライン、離席、取り込み中...などの対応する ICQ の"
-"アイコンがあります)"
+"(例: ICQ からの相手先にはオンライン、離席中、取り込み中...などの対応する ICQ "
+"のアイコンがあります)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr "ASCII 感情アイコンを変換 (_C)"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "スタイル"
 
-#: gajim/data/gui/preferences_window.ui:2117
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2125
 msgid "Show _Features"
-msgstr "機能"
+msgstr "特徴を表示 (_U)"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr "音声出力デバイス (_U)"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr "音声入力デバイス (_A)"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr "音声"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr "ビデオ"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 msgid "_Video input device"
 msgstr "ビデオ入力デバイス (_V)"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 msgid "Video output"
 msgstr "ビデオ出力"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr "ビデオのフレームレート (_F)"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr "ビデオの大きさ (_Z)"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr "自分の画像入力を見る (_E)"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "接続"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 msgid "STU_N server"
 msgstr "STUN サーバー (_N)"
 
-#: gajim/data/gui/preferences_window.ui:2448
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
-"STUN サーバー。空なら、Gajim はサーバーから探索\n"
-"しようとします。"
+"STUN サーバー名。空なら、Gajim はサーバーから探索\n"
+"しようとします。(例: stun.iptel.org)"
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr "音声/ビデオ"
 
-#: gajim/data/gui/preferences_window.ui:2520
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
-msgstr "デフォルトのプロキシ:"
+msgstr "全体ののプロキシ (_G)"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "管理...(_M)"
 
-#: gajim/data/gui/preferences_window.ui:2580
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2587
 msgid "_Store status changes of contacts in history"
-msgstr "相手先の状況変更を記録する (_L)"
+msgstr "相手先の状況変更を履歴に記録する (_S)"
 
-#: gajim/data/gui/preferences_window.ui:2602
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
-msgstr "名簿を絞り込み"
+msgstr "デバッグのログを有効化(再起動が必要) (_D)"
 
-#: gajim/data/gui/preferences_window.ui:2606
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2613
 msgid "If checked, Gajim will store a log file for debugging"
-msgstr "チェックをつけると、Gajim はこのアカウントのパスワードを記憶します"
+msgstr "チェックをつけると、Gajim はデバッグのためにログファイルを残します"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
+msgstr "デバッグのログを置くフォルダを開きます"
+
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "その他の設定"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
-msgstr ""
+msgstr "注意: これらのオプションの取扱には注意してください。"
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "開く...(_O)"
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 msgid "Advanced Configuration Editor (ACE)"
-msgstr "詳細設定エディタ"
+msgstr "詳細設定エディタ (ACE)"
 
 #: gajim/data/gui/groupchat_config.ui:55
-#, fuzzy
 msgid ""
 "<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
@@ -6634,18 +6449,17 @@ msgid ""
 "&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/"
 "resource)\n"
 msgstr ""
-"<b>XMPP アドレスAddress</b>\n"
-"次のいずれかの形が可能です:\n"
+"<b>XMPP アドレス</b>\n"
 "&lt;ユーザー@ドメイン/リソース&gt; (リソースが合致する場合のみ)\n"
 "&lt;ユーザー@ドメイン&gt; (リソースが何であれ合致)\n"
 "&lt;ドメイン/リソース&gt; (リソースが合致する場合のみ)\n"
 "&lt;ドメイン&gt; (ドメインの合致。どんな user@domain や domain/resource でも"
-"可)"
+"可)\n"
 
 #: gajim/data/gui/groupchat_config.ui:132
 #: gajim/data/gui/groupchat_config.ui:156
 msgid "Only Admins and Owners can modify the affiliation"
-msgstr ""
+msgstr "管理人と主宰者だけが分掌を変更できます"
 
 #: gajim/data/gui/groupchat_config.ui:270
 #: gajim/data/gui/groupchat_info_scrolled.ui:179 gajim/plugins/gui.py:317
@@ -6759,9 +6573,8 @@ msgid "Manage Proxies..."
 msgstr "プロキシを管理..."
 
 #: gajim/data/gui/account_wizard.ui:131
-#, fuzzy
 msgid "Advanced Settings"
-msgstr "チャットのショートカット"
+msgstr "詳細設定"
 
 #: gajim/data/gui/account_wizard.ui:163 gajim/data/gui/manage_proxies.ui:290
 msgid "_Type"
@@ -6769,12 +6582,11 @@ msgstr "種類 (_T)"
 
 #: gajim/data/gui/account_wizard.ui:203
 msgid "Welcome"
-msgstr ""
+msgstr "ようこそ"
 
 #: gajim/data/gui/account_wizard.ui:219
-#, fuzzy
 msgid "Please enter your credentials or Sign Up"
-msgstr "新しいテーマを作成してください。"
+msgstr "あなたの認証情報を入力するか、新規登録してください。"
 
 #: gajim/data/gui/account_wizard.ui:237
 msgid "Your XMPP address (e.g. user@example.org)"
@@ -6789,15 +6601,13 @@ msgstr "user@example.org"
 msgid "Your password"
 msgstr "パスワード"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
-#, fuzzy
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 msgid "_Advanced Settings"
-msgstr "チャットのショートカット"
+msgstr "詳細設定 (_A)"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
-#, fuzzy
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 msgid "Proxy, custom hostname and port"
-msgstr "別のホスト名/ポート番号を使う"
+msgstr "プロキシ、別のホスト名、ポート番号"
 
 #: gajim/data/gui/account_wizard.ui:283
 msgid "_Log In"
@@ -6805,13 +6615,12 @@ msgstr "ログイン (_L)"
 
 #: gajim/data/gui/account_wizard.ui:288
 msgid "Log in with your credentials"
-msgstr ""
+msgstr "あなたの認証情報でログインしてください"
 
 # 固有名詞(プロキシ・サーバー The Onion Router)
 #: gajim/data/gui/account_wizard.ui:304
-#, fuzzy
 msgid "or"
-msgstr "or"
+msgstr "または"
 
 # (Mako)"Ask status message when I:" に続く語
 #: gajim/data/gui/account_wizard.ui:314
@@ -6824,31 +6633,29 @@ msgstr "選んだサーバーに新しいアカウントを登録します"
 
 #: gajim/data/gui/account_wizard.ui:369
 msgid "Visit Website"
-msgstr ""
+msgstr "ウェブサイトを開く"
 
 #: gajim/data/gui/account_wizard.ui:410
-#, fuzzy
 msgid "Certificate Verification Failed"
-msgstr "%s のSSL 証明書の検証"
+msgstr "SSL 証明書の検証に失敗しました"
 
 #: gajim/data/gui/account_wizard.ui:428
 msgid ""
 "The following warnings came up while trying to verify the server's "
 "certificate"
-msgstr ""
+msgstr "サーバー証明書の検証中に次の警告が発生しました"
 
 #: gajim/data/gui/account_wizard.ui:457
 msgid "_Show Certificate"
 msgstr "証明書を表示 (_S)"
 
 #: gajim/data/gui/account_wizard.ui:472
-#, fuzzy
 msgid "_Add to Trusted Certificates"
-msgstr "暗号化された証明書"
+msgstr "信用された証明書を追加 (_A)"
 
 #: gajim/data/gui/account_wizard.ui:501 gajim/data/gui/account_wizard.ui:664
 msgid "Which server should I choose?"
-msgstr ""
+msgstr "どのサーバーを選びますか ?"
 
 #: gajim/data/gui/account_wizard.ui:516
 msgid ""
@@ -6856,14 +6663,17 @@ msgid ""
 "Creating an account on one server allows you to communicate with contacts "
 "from other servers as well."
 msgstr ""
+"選択できるサーバーはたくさんあります。\n"
+"ひとつのサーバーにアカウントを作成すれば、他のサーバーの相手先と通信できま"
+"す。"
 
 #: gajim/data/gui/account_wizard.ui:530
 msgid "Visit Server's Website"
-msgstr ""
+msgstr "サーバーのウェブサイトを開く"
 
 #: gajim/data/gui/account_wizard.ui:550
 msgid "Listing of Servers"
-msgstr "サーバーの一覧表示"
+msgstr "サーバーの一覧"
 
 #: gajim/data/gui/account_wizard.ui:568
 msgid ""
@@ -6873,7 +6683,7 @@ msgstr ""
 
 #: gajim/data/gui/account_wizard.ui:586
 msgid "A Feature Comparison of Various Servers"
-msgstr "サーバーの機能の比較"
+msgstr "サーバーの特徴の比較"
 
 #: gajim/data/gui/account_wizard.ui:604
 msgid ""
@@ -6884,7 +6694,7 @@ msgstr ""
 "a>"
 
 # (Mako)"Ask status message when I:" に続く語
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 msgid "Sign Up"
 msgstr "登録"
 
@@ -6894,11 +6704,11 @@ msgstr "サーバーを選択してください (_P)"
 
 #: gajim/data/gui/account_wizard.ui:702
 msgid "Sign up Anonymously"
-msgstr ""
+msgstr "匿名で登録"
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
-msgstr ""
+msgstr "注意: 匿名アカウントはすべてのサーバーで可能というわけではありません"
 
 #: gajim/data/gui/advanced_configuration.ui:39
 msgid "You should restart Gajim for some changes to take effect"
@@ -6910,7 +6720,7 @@ msgstr "フィルター (_F)"
 
 #: gajim/data/gui/advanced_configuration.ui:88
 msgid "Type to search for values..."
-msgstr ""
+msgstr "検索する語を入力してください…"
 
 #: gajim/data/gui/advanced_configuration.ui:180
 msgid "_Reset Value"
@@ -6920,8 +6730,8 @@ msgstr "値をリセット (_R)"
 msgid "Resets value to default"
 msgstr "値をデフォルトに戻します"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 msgid "Hostname"
 msgstr "ホスト名"
 
@@ -6935,11 +6745,11 @@ msgstr "サーバーの稼働時間"
 
 #: gajim/data/gui/server_info.ui:109
 msgid "Contact Addresses"
-msgstr "相手先のアドレス"
+msgstr "連絡先アドレス"
 
 #: gajim/data/gui/server_info.ui:124
 msgid "No contact addresses published for this server."
-msgstr ""
+msgstr "このサーバーで公開されている連絡先はありません。"
 
 #: gajim/data/gui/server_info.ui:177
 msgid "Proxy Type"
@@ -6957,7 +6767,7 @@ msgstr "証明書を表示 (_C)"
 msgid "Proxy Host"
 msgstr "プロキシのホスト"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "種類"
 
@@ -6966,14 +6776,12 @@ msgid "Protocol"
 msgstr "プロトコル"
 
 #: gajim/data/gui/server_info.ui:333
-#, fuzzy
 msgid "Copy info to clipboard"
-msgstr "リンクの場所をコピー (_C)"
+msgstr "情報をクリップボードにコピー"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
-msgstr "機能"
+msgstr "特徴"
 
 #: gajim/data/gui/privacy_lists_window.ui:34
 msgid "Privacy Lists:"
@@ -6985,9 +6793,8 @@ msgid "_Address"
 msgstr "アドレス (_A)"
 
 #: gajim/data/gui/service_discovery_window.ui:152
-#, fuzzy
 msgid "Go"
-msgstr "実行 (_O)"
+msgstr "移動"
 
 #: gajim/data/gui/synchronise_select_contacts_dialog.ui:8
 msgid "Synchronise : select contacts"
@@ -7007,13 +6814,12 @@ msgid "Identified Error"
 msgstr "SSL 証明書エラー"
 
 #: gajim/data/gui/ssl_error_dialog.ui:62
-#, fuzzy
 msgid "<error>"
-msgstr "誤差"
+msgstr "<エラー>"
 
 #: gajim/data/gui/ssl_error_dialog.ui:74
 msgid "Add this certificate to the list of _trusted certificates"
-msgstr "この証明書を、信頼できる証明書一覧に加えます (_T)"
+msgstr "この証明書を、信用された証明書一覧に加えます (_T)"
 
 #: gajim/data/gui/ssl_error_dialog.ui:92
 msgid "_Ignore this error for this certificate"
@@ -7032,23 +6838,20 @@ msgid "Message..."
 msgstr "メッセージ…"
 
 #: gajim/data/gui/groupchat_invitation_received.ui:120
-#, fuzzy
 msgid "_Message if you decline (optional)"
-msgstr "理由 (断る場合)"
+msgstr "断る場合の理由(省略可) (_M)"
 
 #: gajim/data/gui/edit_groups_dialog.ui:8
 msgid "Edit Groups"
 msgstr "グループを編集"
 
 #: gajim/data/gui/change_status_message_dialog.ui:116
-#, fuzzy
 msgid "Save this message as a preset"
-msgstr "このヘルプを表示して終了"
+msgstr "このメッセージを事前設定として保存します"
 
 #: gajim/data/gui/change_status_message_dialog.ui:152
-#, fuzzy
 msgid "Preset _messages"
-msgstr "用意されたメッセージ:"
+msgstr "メッセージを事前設定 (M)"
 
 #: gajim/data/gui/change_status_message_dialog.ui:170
 msgid "Ac_tivity"
@@ -7139,6 +6942,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "状況メッセージを変更…"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>気分:</b>"
@@ -7149,12 +6957,11 @@ msgstr "<b>メッセージ:</b>"
 
 #: gajim/data/gui/themes_window.ui:43
 msgid "Add a setting you would like to change"
-msgstr ""
+msgstr "変更したい設定を追加してください"
 
 #: gajim/data/gui/themes_window.ui:171
-#, fuzzy
 msgid "Add Setting"
-msgstr "チャットのショートカット"
+msgstr "設定を追加"
 
 #: gajim/data/gui/themes_window.ui:204
 msgid "Add new Theme"
@@ -7206,8 +7013,8 @@ msgstr "インストール済"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "プラグインの説明がここに表示されます。この文はプラグインウィンドウの初期化の"
 "際に消去されます。"
@@ -7315,9 +7122,8 @@ msgid "Choose Sound"
 msgstr "サウンドの選択"
 
 #: gajim/data/gui/manage_sounds_window.ui:112
-#, fuzzy
 msgid "Clear Sound"
-msgstr "サウンドの選択"
+msgstr "サウンドを消去"
 
 #: gajim/data/gui/manage_sounds_window.ui:133
 msgid "Play Sound"
@@ -7349,7 +7155,6 @@ msgid "HTTP"
 msgstr "HTTP"
 
 #: gajim/data/gui/manage_proxies.ui:15
-#, fuzzy
 msgctxt "proxy configuration"
 msgid "SOCKS5"
 msgstr "SOCKS5"
@@ -7379,92 +7184,114 @@ msgid "_Host"
 msgstr "ホスト名 (_H)"
 
 #: gajim/data/gui/manage_proxies.ui:255 gajim/gtk/adhoc.py:322
-#, fuzzy
 msgid "Settings"
-msgstr "チャットのショートカット"
+msgstr "設定"
 
 #: gajim/data/gui/manage_proxies.ui:307
 #: gajim/data/gui/groupchat_creation.ui:105
 msgid "_Name"
 msgstr "名前 (_N)"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 msgid "Proxy"
 msgstr "プロキシ"
 
+#: gajim/data/gui/application_menu.ui:8
+msgid "_Start / Join Chat…"
+msgstr "チャットを開始… (_S)"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
-#, fuzzy
-msgid "Create Group Chat"
-msgstr "グループチャットから退出"
+msgid "Create _Group Chat…"
+msgstr "談話室を作成… (_G)"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr "プラグイン"
+#: gajim/data/gui/application_menu.ui:18
+msgid "_History Manager"
+msgstr "履歴管理 (_H)"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
-msgstr "設定"
+#: gajim/data/gui/application_menu.ui:22
+msgid "Pl_ugins"
+msgstr "プラグイン (_U)"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+msgid "_Preferences"
+msgstr "設定 (_P)"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "終了"
+#: gajim/data/gui/application_menu.ui:36
+msgid "_Accounts"
+msgstr "アカウント (_A)"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
-msgstr "表示"
+msgid "_View"
+msgstr "表示 (_V)"
 
-#: gajim/data/gui/application_menu.ui:42
-msgid "Show Contact List"
-msgstr "相手先一覧を表示"
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
+msgid "Show _Contact List"
+msgstr "相手先一覧を表示 (_C)"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
-msgstr "オフラインの相手先を表示"
+msgid "Show _Offline Contacts"
+msgstr "オフラインの相手先を表示 (_O)"
 
 #: gajim/data/gui/application_menu.ui:50
-msgid "Show Active Contacts"
-msgstr "アクティブな相手先のみ表示"
+msgid "Show _Active Contacts"
+msgstr "アクティブな相手先のみ表示 (_A)"
 
 #: gajim/data/gui/application_menu.ui:54
-msgid "Show Transports"
-msgstr "中継先を表示"
+msgid "Show _Transports"
+msgstr "中継先を表示 (_T)"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
-msgstr "XML コンソール"
+#: gajim/data/gui/application_menu.ui:60
+msgid "_XML Console"
+msgstr "XML コンソール (_X)"
+
+#: gajim/data/gui/application_menu.ui:64
+msgid "_File Transfer"
+msgstr "ファイル転送 (_F)"
 
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
-msgstr "ヘルプ"
+msgid "_Help"
+msgstr "ヘルプ (_H)"
 
 #: gajim/data/gui/application_menu.ui:77
-msgid "Wiki (Online)"
-msgstr "Wiki (オンライン)"
+msgid "_Wiki (Online)"
+msgstr "Wiki (オンライン) (_W)"
 
 #: gajim/data/gui/application_menu.ui:81
-msgid "FAQ (Online)"
-msgstr "FAQ (オンライン)"
+msgid "FA_Q (Online)"
+msgstr "FAQ (オンライン) (_Q)"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
-msgstr "キーボードショートカット"
+msgid "_Keyboard Shortcuts"
+msgstr "キーボードショートカット (_K)"
+
+#: gajim/data/gui/application_menu.ui:89
+msgid "_Features"
+msgstr "特徴 (_F)"
+
+#: gajim/data/gui/application_menu.ui:93
+msgid "_About"
+msgstr "概略 (_A)"
 
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
-msgstr ""
+msgstr "公開か非公開か ?"
 
 #: gajim/data/gui/groupchat_creation.ui:42
 msgid ""
 "<b>Private:</b> If you plan to chat encrypted, you would typically want to "
 "create a private group chat. You have to invite people so they can join."
 msgstr ""
+"<b>非公開:</b> 暗号化されたチャットをしない場合などには、非公開談話室を作成し"
+"ます。参加するには招待が必要です。"
 
 #: gajim/data/gui/groupchat_creation.ui:58
 msgid "<b>Public:</b> Anyone who knows the address can join."
-msgstr ""
+msgstr "<b>公開:</b> アドレスを知っていれば誰でも参加できます。"
+
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+msgid "Create Group Chat"
+msgstr "談話室を作成"
 
 #: gajim/data/gui/groupchat_creation.ui:122
 msgid "_Description"
@@ -7472,7 +7299,7 @@ msgstr "説明 (_D)"
 
 #: gajim/data/gui/groupchat_creation.ui:164
 msgid "_Public"
-msgstr ""
+msgstr "公開 (_P)"
 
 #: gajim/data/gui/groupchat_creation.ui:278
 msgid "_Account"
@@ -7480,13 +7307,15 @@ msgstr "アカウント (_A)"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
-msgstr ""
+msgstr "想定外のことが起きました"
 
 #: gajim/data/gui/exception_dialog.ui:66
 msgid ""
 "Gajim encountered an error. A report is shown below.\n"
 "By reporting this bug you might help people to fix this."
 msgstr ""
+"Gajimでエラーが発生しました。レポートは以下のとおりです。\n"
+"このバグを報告すると、これを修正するのに役立つかもしれません。"
 
 #: gajim/data/gui/exception_dialog.ui:116
 msgid "_Report Bug"
@@ -7497,19 +7326,17 @@ msgid "_Deny"
 msgstr "拒否する (_D)"
 
 #: gajim/data/gui/subscription_request_window.ui:153
-#, fuzzy
 msgid ""
 "Deny authorization from contact so the contact cannot know if you are "
 "connected"
 msgstr ""
-"承認しないと、あなたが接続したときに相手先はそのことを知ることができません"
+"拒否すると、あなたが接続したときに相手先はそのことを知ることができません"
 
 #: gajim/data/gui/subscription_request_window.ui:165
 msgid "Ac_cept"
 msgstr "承認する (_C)"
 
 #: gajim/data/gui/subscription_request_window.ui:171
-#, fuzzy
 msgid "Authorize contact so the contact can know if you are connected"
 msgstr "承認すると、あなたが接続したときに相手先はそのことを知ることができます"
 
@@ -7519,7 +7346,7 @@ msgstr "アドレス"
 
 #: gajim/data/gui/groupchat_info_scrolled.ui:49
 msgid "Topic"
-msgstr ""
+msgstr "話題"
 
 #: gajim/data/gui/groupchat_info_scrolled.ui:65
 msgid "Author"
@@ -7567,7 +7394,7 @@ msgstr "自動参加"
 
 #: gajim/data/gui/bookmarks.ui:211
 msgid "_Apply"
-msgstr ""
+msgstr "適用 (_A)"
 
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
@@ -7579,10 +7406,9 @@ msgstr "削除 (_D)"
 
 #: gajim/data/gui/history_manager.ui:29 gajim/data/gui/history_manager.ui:91
 msgid "Gajim History Logs Manager"
-msgstr "Gajim 履歴記録マネージャー"
+msgstr "Gajim 履歴記録管理"
 
 #: gajim/data/gui/history_manager.ui:108
-#, fuzzy
 msgid ""
 "This history manager is not intended for viewing chat history. If you are "
 "looking for such functionality, please use the history window instead.\n"
@@ -7590,11 +7416,11 @@ msgid ""
 "You can use this program to delete or export history. Either select logs "
 "from the left or search the database."
 msgstr ""
-"この記録マネージャーは記録を見るためのものではありません。そのような機能のた"
-"めには、かわりに履歴ウィンドウを使ってください。\n"
+"この履歴マネージャーはチャットの履歴を見るためのものではありません。そのよう"
+"な機能のためには、かわりに履歴ウィンドウを使ってください。\n"
 "\n"
-"このプログラムは記録の削除や書き出しのために使ってください。左の一覧から記録"
-"を選択し、また下の欄でデータベースを検索できます。"
+"このプログラムは履歴の削除や書き出しのために使ってください。左の一覧から記録"
+"を選択するか、または下の欄でデータベースを検索できます。"
 
 #: gajim/data/gui/history_manager.ui:124
 msgid ""
@@ -7704,11 +7530,11 @@ msgstr "次の未読タブへ切替"
 
 #: gajim/data/gui/shortcuts_window.ui:155
 msgid "Move tab to the left"
-msgstr ""
+msgstr "タブを左へ移動"
 
 #: gajim/data/gui/shortcuts_window.ui:162
 msgid "Move tab to the right"
-msgstr ""
+msgstr "タブを右へ移動"
 
 #: gajim/data/gui/shortcuts_window.ui:169
 msgid "Close chat"
@@ -7719,57 +7545,62 @@ msgid "Contact List Shortcuts"
 msgstr "相手先一覧のショートカット"
 
 #: gajim/data/gui/shortcuts_window.ui:196
-#, fuzzy
 msgid "Create new group chat"
-msgstr "グループチャットから退出"
+msgstr "新しい談話室を作成"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "設定"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "プラグイン"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 msgid "File transfers"
-msgstr "ファイルの転送"
+msgstr "ファイル転送"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr "状況メッセージを設定"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 msgid "Show XML console"
 msgstr "XML コンソールを表示"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "外観"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "オフラインの相手先を表示"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 msgid "Show only active contacts"
 msgstr "アクティブな相手先のみ表示"
 
-#: gajim/data/gui/shortcuts_window.ui:272
-#, fuzzy
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr "相手先一覧を絞り込み"
 
-#: gajim/data/gui/shortcuts_window.ui:279
-#, fuzzy
+#: gajim/data/gui/shortcuts_window.ui:272
 msgid "Show / hide contact list"
-msgstr "アクティブな相手先のみ表示"
+msgstr "相手先一覧を表示/非表示"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "相手先"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "相手先の情報"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr "相手先の名前を変更"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "相手先を削除"
 
@@ -7778,14 +7609,12 @@ msgid "Passphrase"
 msgstr "パスフレーズ"
 
 #: gajim/data/gui/history_window.ui:27
-#, fuzzy
 msgid "Display status changes"
-msgstr "相手先の状況変更を記録する (_S)"
+msgstr "状況変更を表示"
 
 #: gajim/data/gui/history_window.ui:233
-#, fuzzy
 msgid "Mode"
-msgstr "司会者"
+msgstr "モード"
 
 #: gajim/data/gui/history_window.ui:246
 msgid "Search complete history"
@@ -7796,12 +7625,10 @@ msgid "Search selected day only"
 msgstr "選択した日の中だけでの検索 "
 
 #: gajim/data/gui/history_window.ui:317
-#, fuzzy
 msgid "Store history for this chat"
 msgstr "このチャットの履歴を記録"
 
 #: gajim/data/gui/history_window.ui:332
-#, fuzzy
 msgid "Store History"
 msgstr "履歴を記録"
 
@@ -7810,21 +7637,20 @@ msgid ""
 "No contacts left.\n"
 "You can also type an XMPP address."
 msgstr ""
+"相手先がありません。\n"
+"XMPP アドレスを入力できます。"
 
 #: gajim/data/gui/groupchat_invite.ui:69
-#, fuzzy
 msgid "Invitees"
-msgstr "招待 (_V)"
+msgstr "招待者"
 
 #: gajim/data/gui/groupchat_invite.ui:153
-#, fuzzy
 msgid "Search contacts..."
-msgstr "データベースを検索 (_S)"
+msgstr "相手先を検索…"
 
 #: gajim/data/gui/groupchat_invite.ui:223
-#, fuzzy
 msgid "Click on contacts you would like to invite to this group chat."
-msgstr "%(jid)s は既にこの談話室に招待されています"
+msgstr "この談話室に招待したい相手先をクリックしてください。"
 
 #: gajim/data/gui/manage_pep_services_window.ui:46
 msgid "Configure"
@@ -7840,14 +7666,17 @@ msgstr "次の欄を埋めてください。"
 
 #: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:40
 msgid "Group Chat Configuration"
-msgstr "グループチャットの調整"
+msgstr "談話室の調整"
+
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML コンソール"
 
 #: gajim/data/gui/xml_console.ui:131
-#, fuzzy
 msgid "Start Search..."
-msgstr "チャットを開始...(_S)"
+msgstr "検索を開始..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "フィルター"
 
@@ -7857,7 +7686,7 @@ msgstr "消去"
 
 #: gajim/data/gui/xml_console.ui:302
 msgid "Paste Last Input"
-msgstr ""
+msgstr "最後の入力を貼り付け"
 
 # (Mako)あえて訳さない
 #: gajim/data/gui/xml_console.ui:316
@@ -7891,15 +7720,10 @@ msgstr "すべての保留イベントの表示 (_E)"
 msgid "Mute Sounds"
 msgstr "サウンドのミュート"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-msgid "_Preferences"
-msgstr "設定 (_P)"
-
 # (Mako)subscription
 #: gajim/data/gui/single_message_window.ui:42
-#, fuzzy
 msgid "_To"
-msgstr "相手先が承認"
+msgstr "宛先 (_T)"
 
 #: gajim/data/gui/single_message_window.ui:71
 msgid "Su_bject"
@@ -7907,25 +7731,23 @@ msgstr "題 (_B)"
 
 #: gajim/data/gui/single_message_window.ui:88
 msgid "Type the subject here..."
-msgstr ""
+msgstr "ここに題を入力してください…"
 
 # (Mako)あえて訳さない
 #: gajim/data/gui/single_message_window.ui:102
 msgid "_Message"
-msgstr "_Message"
+msgstr "メッセージ (_M)"
 
 #: gajim/data/gui/single_message_window.ui:144
-#, fuzzy
 msgid "Characters typed: 0"
-msgstr "使えない文字です"
+msgstr "入力文字数: 0"
 
 # (Mako)groups_post_window.ui は、メールの「差出人」に相当
 # helpers.pyは、
 # 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
 #: gajim/data/gui/single_message_window.ui:189
-#, fuzzy
 msgid "_From"
-msgstr "こちらが承認 (_F)"
+msgstr "差出人 (_F)"
 
 #: gajim/data/gui/single_message_window.ui:309
 msgid "Sen_d"
@@ -7981,6 +7803,8 @@ msgid ""
 "Command disabled. This command can be enabled by setting "
 "'command_system_execute' to True in ACE (Advanced Configuration Editor)."
 msgstr ""
+"コマンドは無効です。このコマンドは、詳細設定エディタ(ACE)で "
+"'command_system_execute' を設定して、有効にできます。"
 
 #: gajim/command_system/implementation/execute.py:125
 msgid "Execute expression inside a shell, send output"
@@ -8056,38 +7880,33 @@ msgid "Command is not supported for zeroconf accounts"
 msgstr "コマンドは、zeroconf アカウントには使えません"
 
 #: gajim/command_system/implementation/standard.py:196
-#, fuzzy
 msgid "Send DTMF sequence through an open voice chat"
-msgstr "接続している音声セッションに DTMF 手順を送信します"
+msgstr "接続している音声チャットに DTMF 手順を送信します"
 
 #: gajim/command_system/implementation/standard.py:199
-#, fuzzy
 msgid "No open voice chats with the contact"
-msgstr "この相手先と接続している音声セッションがありません"
+msgstr "この相手先と接続している音声チャットがありません"
 
 #: gajim/command_system/implementation/standard.py:202
 #, python-format
 msgid "%s is not a valid tone"
-msgstr "%s は有効なトーンではありません"
+msgstr "%s は正しいトーンではありません"
 
 #: gajim/command_system/implementation/standard.py:209
 msgid "Toggle Voice Chat"
-msgstr ""
+msgstr "音声チャットにする/しない"
 
 #: gajim/command_system/implementation/standard.py:212
-#, fuzzy
 msgid "Voice chats are not available"
-msgstr "ビデオセッションは有効ではありません"
+msgstr "音声チャットは有効ではありません"
 
 #: gajim/command_system/implementation/standard.py:219
-#, fuzzy
 msgid "Toggle Video Chat"
-msgstr "ビデオセッションにする/しない"
+msgstr "ビデオチャットにする/しない"
 
 #: gajim/command_system/implementation/standard.py:222
-#, fuzzy
 msgid "Video chats are not available"
-msgstr "ビデオセッションは有効ではありません"
+msgstr "ビデオチャットは有効ではありません"
 
 #: gajim/command_system/implementation/standard.py:229
 msgid "Send a message to the contact that will attract their attention"
@@ -8095,14 +7914,13 @@ msgstr "相手先に注目させるためのメッセージを送信します"
 
 #: gajim/command_system/implementation/standard.py:269
 msgid "Change your nickname in a group chat"
-msgstr "グループチャットでニックネームを変更します"
+msgstr "談話室でニックネームを変更します"
 
 #: gajim/command_system/implementation/standard.py:274
 msgid "Invalid nickname"
-msgstr "ニックネームは有効ではありません"
+msgstr "ニックネームは正しくありません"
 
 #: gajim/command_system/implementation/standard.py:281
-#, fuzzy
 msgid "Open a private chat window with a specified participant"
 msgstr "指定した在室者との私信のウィンドウを開きます"
 
@@ -8115,18 +7933,16 @@ msgid "Nickname not found"
 msgstr "ニックネームは見つかりません"
 
 #: gajim/command_system/implementation/standard.py:290
-#, fuzzy
 msgid ""
 "Open a private chat window with a specified participant and send him a "
 "message"
-msgstr "指定した在室者との私信のウィンドウを開き、メッセージを送信します"
+msgstr "指定した参加者との私信のウィンドウを開き、メッセージを送信します"
 
 #: gajim/command_system/implementation/standard.py:300
 msgid "Display or change a group chat topic"
-msgstr "グループチャットの題を表示または変更します"
+msgstr "談話室の題を表示または変更します"
 
 #: gajim/command_system/implementation/standard.py:309
-#, fuzzy
 msgid "Invite a user to a group chat for a reason"
 msgstr "理由を添えて、談話室に招待します"
 
@@ -8136,17 +7952,15 @@ msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(jid)s を %(room_jid)s に招待しました"
 
 #: gajim/command_system/implementation/standard.py:317
-#, fuzzy
 msgid "Join a group chat given by an XMPP Address"
-msgstr "JID 指定でグループチャットに参加"
+msgstr "XMPP アドレス 指定で談話室に参加"
 
 #: gajim/command_system/implementation/standard.py:327
-#, fuzzy
 msgid ""
 "Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
-"グループチャットから退出し (理由があればそれを送信します)、タブまたはウィンド"
-"ウを閉じます"
+"談話室から退出し (理由があればそれを送信します)、タブまたはウィンドウを閉じま"
+"す"
 
 #: gajim/command_system/implementation/standard.py:333
 msgid ""
@@ -8157,25 +7971,22 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    ニックネームまたは JID で指定するユーザーをグループチャットから締め出しま"
-"す\n"
+"    ニックネームまたは JID で指定するユーザーを談話室から締め出します\n"
 "\n"
 "    ニックネームが見つからなければ JID として扱います。\n"
 "    "
 
 #: gajim/command_system/implementation/standard.py:349
-#, fuzzy
 msgid "Kick user from group chat by nickname"
-msgstr "ニックネームで指定するユーザーをグループチャットから蹴り出します"
+msgstr "ニックネームで指定するユーザーを談話室から蹴り出します"
 
 #: gajim/command_system/implementation/standard.py:358
-#, fuzzy
 msgid ""
 "Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
-"グループチャットでの役を設定します。\n"
+"談話室での役を設定します。\n"
 "    役は次のいずれかの値です:\n"
 "    moderator (司会者), participant (参加者), visitor (傍聴者), none (なし)"
 
@@ -8184,13 +7995,12 @@ msgid "Invalid role given"
 msgstr "役が正しくありません"
 
 #: gajim/command_system/implementation/standard.py:370
-#, fuzzy
 msgid ""
 "Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
-"グループチャットでの分掌を設定します。\n"
+"談話室での分掌を設定します。\n"
 "    分掌は次のいずれかの値です:\n"
 "    owner (主宰者), admin (管理者), member (メンバー), outcast (追放者), "
 "none (なし)"
@@ -8200,19 +8010,16 @@ msgid "Invalid affiliation given"
 msgstr "分掌が正しくありません"
 
 #: gajim/command_system/implementation/standard.py:385
-#, fuzzy
 msgid "Display names of all group chat participants"
-msgstr "グループチャットのすべての在室者の名前を表示します"
+msgstr "談話室のすべての参加者の名前を表示します"
 
 #: gajim/command_system/implementation/standard.py:407
-#, fuzzy
 msgid "Forbid a participant to send you public or private messages"
-msgstr "在室者がメッセージ (私信も含む) を送ってくることを禁止します"
+msgstr "参加者がメッセージ (私信も含む) を送ってくることを禁止します"
 
 #: gajim/command_system/implementation/standard.py:412
-#, fuzzy
 msgid "Allow a participant to send you public or private messages"
-msgstr "在室者がメッセージ (私信も含む) を送ってくることを許可します"
+msgstr "参加者がメッセージ (私信も含む) を送ってくることを許可します"
 
 #: gajim/command_system/implementation/middleware.py:76
 msgid "Error during command execution!"
@@ -8223,136 +8030,120 @@ msgid "The same as using a doc-string, except it supports translation"
 msgstr "使う文章は同じものとします (翻訳は除く)"
 
 #: gajim/gtk/filetransfer_progress.py:104
-#, fuzzy, python-format
+#, python-format
 msgid "%(progress)s of %(total)s"
-msgstr "%(max)s のうち %(received)s"
+msgstr "%(total)s のうち %(progress)s"
 
 #: gajim/gtk/filetransfer_progress.py:121
 #, python-format
 msgid "%(minutes)s min %(seconds)s sec"
-msgstr ""
+msgstr "%(minutes)s分%(seconds)s秒"
 
-#: gajim/gtk/groupchat_info.py:38
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:37
 msgid "?Group chat feature:Open"
-msgstr "なし"
+msgstr "開放"
 
-#: gajim/gtk/groupchat_info.py:39
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
-msgstr "%s さんが参加しました"
+msgstr "誰でもこの談話室に参加できます"
 
-#: gajim/gtk/groupchat_info.py:42
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:41
 msgid "?Group chat feature:Members Only"
-msgstr "グループチャットのメッセージの強調:"
+msgstr "メンバー制"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
-msgstr ""
+msgstr "この談話室はメンバーのみ入室できます"
 
-#: gajim/gtk/groupchat_info.py:47
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:46
 msgid "?Group chat feature:Not Anonymous"
-msgstr "グループチャットに対応"
+msgstr "非匿名"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
-msgstr ""
+msgstr "談話室のすべての参加者があなたの XMPP アドレスを見ることができます"
 
-#: gajim/gtk/groupchat_info.py:52
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:51
 msgid "?Group chat feature:Semi-Anonymous"
-msgstr "グループチャットのメッセージの強調:"
+msgstr "半匿名"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
-msgstr ""
+msgstr "司会者のみがあなたの XMPP アドレスを見ることができます"
 
-#: gajim/gtk/groupchat_info.py:56
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:55
 msgid "?Group chat feature:Moderated"
-msgstr "なし"
+msgstr "司会あり"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
-msgstr ""
+msgstr "この談話室の参加者は書込権を得る必要があります"
 
-#: gajim/gtk/groupchat_info.py:61
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:60
 msgid "?Group chat feature:Not Moderated"
-msgstr "グループチャットに対応"
+msgstr "司会なし"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
-msgstr ""
+msgstr "この談話室の参加者はメッセージを送ることができます"
 
-#: gajim/gtk/groupchat_info.py:66
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:65
 msgid "?Group chat feature:Public"
-msgstr "グループチャットのメッセージの強調:"
+msgstr "公開"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
-msgstr ""
+msgstr "談話室は検索で見つけられます"
 
-#: gajim/gtk/groupchat_info.py:70
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:69
 msgid "?Group chat feature:Hidden"
-msgstr "なし"
+msgstr "非公開"
 
-#: gajim/gtk/groupchat_info.py:71
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:70
 msgid "This group chat can not be found via search"
-msgstr "元に戻すことができません。"
+msgstr "この談話室は検索によって見つけられることはありません"
 
-#: gajim/gtk/groupchat_info.py:74
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:73
 msgid "?Group chat feature:Password Required"
-msgstr "グループチャットに対応"
+msgstr "要パスワード"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
-msgstr ""
+msgstr "この談話室に入るにはパスワードが必要です"
 
-#: gajim/gtk/groupchat_info.py:79
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:78
 msgid "?Group chat feature:No Password Required"
-msgstr "グループチャットに対応"
+msgstr "パスワード不要"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
-msgstr ""
+msgstr "この談話室に入るにはパスワードは不要です"
 
-#: gajim/gtk/groupchat_info.py:84
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:83
 msgid "?Group chat feature:Persistent"
-msgstr "グループチャットに対応"
+msgstr "常設"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
-msgstr ""
+msgstr "この談話室は参加者がいなくなっても存続します"
 
-#: gajim/gtk/groupchat_info.py:89
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:88
 msgid "?Group chat feature:Temporary"
-msgstr "なし"
+msgstr "臨時"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
-msgstr ""
+msgstr "この談話室は最後の参加者が退出すると閉鎖されます"
 
-#: gajim/gtk/groupchat_info.py:94
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:93
 msgid "?Group chat feature:Archiving"
-msgstr "グループチャットへの招待"
+msgstr "記録"
 
-#: gajim/gtk/groupchat_info.py:95
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:94
 msgid "Messages are archived on the server"
-msgstr "セッションはサーバーに記録されます"
+msgstr "メッセージはサーバーに記録されます"
 
 #: gajim/gtk/filetransfer.py:91
 msgid "File"
@@ -8363,7 +8154,7 @@ msgid "Time"
 msgstr "時間"
 
 #: gajim/gtk/filetransfer.py:228
-#, fuzzy, python-format
+#, python-format
 msgid "File name: %s"
 msgstr "ファイル名: %s"
 
@@ -8378,7 +8169,7 @@ msgid "Sender: %s"
 msgstr "送信者: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "受取人: "
 
@@ -8392,9 +8183,8 @@ msgid "File transfer completed"
 msgstr "ファイルの転送が完了しました"
 
 #: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
-#, fuzzy
 msgid "Connection with peer could not be established."
-msgstr "ピア接続は確立できません。"
+msgstr "ピア接続は確立できませんでした。"
 
 #: gajim/gtk/filetransfer.py:293
 #, python-format
@@ -8413,20 +8203,18 @@ msgid "Error message: %s"
 msgstr "エラーメッセージ: %s"
 
 #: gajim/gtk/filetransfer.py:335
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The file %s has been received, but it seems to have been damaged along the "
 "way.\n"
 "Do you want to download it again?"
 msgstr ""
-"ファイル %(file)s を受け取りました。しかし、正しく受け取れていないようで"
-"す。\n"
+"ファイル %s を受け取りました。しかし、途中で損傷しているようです。\n"
 "もう一度ダウンロードしますか ?"
 
 #: gajim/gtk/filetransfer.py:341
-#, fuzzy
 msgid "_Download Again"
-msgstr "次回から質問しない (_D)"
+msgstr "再ダウンロード (_D)"
 
 #: gajim/gtk/filetransfer.py:356
 msgid "Gajim can not read this file"
@@ -8437,9 +8225,9 @@ msgid "Another process is using this file."
 msgstr "別のプロセスがこのファイルを使用中です。"
 
 #: gajim/gtk/filetransfer.py:399
-#, fuzzy, python-format
+#, python-format
 msgid "Cannot overwrite existing file '%s'"
-msgstr "既存のファイル \"%s\" に上書きできません"
+msgstr "既存のファイル '%s' に上書きできません"
 
 #: gajim/gtk/filetransfer.py:400
 msgid ""
@@ -8448,36 +8236,31 @@ msgid ""
 msgstr "この名前のファイルは既に存在し、かつ上書きの権限がありません。"
 
 #: gajim/gtk/filetransfer.py:424
-#, fuzzy
 msgid "File Transfer Conflict"
-msgstr "ファイルの転送の完了"
+msgstr "ファイル転送の衝突"
 
 #: gajim/gtk/filetransfer.py:425
-#, fuzzy
 msgid "File already exists"
 msgstr "そのファイルは既に存在しています"
 
 #: gajim/gtk/filetransfer.py:426
 msgid "Resume download or replace file?"
-msgstr ""
+msgstr "ダウンロードを再開するか、ファイルを置き換えますか ?"
 
 #: gajim/gtk/filetransfer.py:430
-#, fuzzy
 msgid "Resume _Download"
-msgstr "ダウンロード"
+msgstr "ダウンロードを再開 (_D)"
 
 #: gajim/gtk/filetransfer.py:433
-#, fuzzy
 msgid "Replace _File"
-msgstr "置換する (_P)"
+msgstr "ファイルを置換する (_F)"
 
 #: gajim/gtk/filetransfer.py:443
-#, fuzzy, python-format
+#, python-format
 msgid "Directory '%s' is not writable"
-msgstr "ディレクトリ \"%s\" に書き込む権限がありません"
+msgstr "ディレクトリ '%s' に書き込む権限がありません"
 
 #: gajim/gtk/filetransfer.py:444
-#, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "このディレクトリにファイルを作成する権限がありません。"
 
@@ -8497,9 +8280,9 @@ msgid "Description: %s"
 msgstr "説明: %s"
 
 #: gajim/gtk/filetransfer.py:486
-#, fuzzy, python-format
+#, python-format
 msgid "%s wants to send you a file"
-msgstr "%s さんがファイルを転送したがっています。"
+msgstr "%s さんがファイルを転送したがっています"
 
 #: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
@@ -8531,7 +8314,7 @@ msgstr "ファイル: "
 msgid "It is not possible to send empty files"
 msgstr "空のファイルを転送することはできません"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "送信者: "
 
@@ -8540,151 +8323,135 @@ msgid "Choose a File to Send…"
 msgstr "転送するファイルを選択…"
 
 #: gajim/gtk/change_password.py:42
-#, fuzzy
 msgid "Change"
-msgstr "ニックネームを変更"
+msgstr "変更"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
-#, fuzzy
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 msgid "Back"
-msgstr "すぐに戻ります"
+msgstr "戻る"
 
 #: gajim/gtk/change_password.py:51
-#, fuzzy
 msgid "Changing Password..."
-msgstr "パスワードを変更"
+msgstr "パスワードを変更…"
 
 #: gajim/gtk/change_password.py:52
-#, fuzzy
 msgid "Trying to change password..."
-msgstr "アカウントのパスワードを変更するにはクリック"
+msgstr "パスワードを変更しています…"
 
 #: gajim/gtk/change_password.py:55 gajim/gtk/change_password.py:56
-#, fuzzy
 msgid "Password Changed"
-msgstr "パスワードが必要です"
+msgstr "パスワードを変更しました"
 
 #: gajim/gtk/change_password.py:57
-#, fuzzy
 msgid "Your password has successfully been changed."
-msgstr "書庫の設定を保存しました。"
+msgstr "パスワードは無事変更されました。"
 
 #: gajim/gtk/change_password.py:60 gajim/gtk/change_password.py:61
-#, fuzzy
 msgid "Password Change Failed"
-msgstr "パスワードが必要です"
+msgstr "パスワード変更に失敗しました"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+msgid "An error occurred while trying to change your password."
+msgstr "パスワード変更時にエラーが起きました"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "パスワードを変更"
 
 #: gajim/gtk/change_password.py:151
-#, fuzzy
 msgid "Please enter your new password."
-msgstr "新しいテーマを作成してください。"
+msgstr "新しいパスワードを入力してください。"
 
 #: gajim/gtk/change_password.py:164
-#, fuzzy
 msgid "Enter new password..."
-msgstr "新しいパスワードを入力してください:"
+msgstr "新しいパスワードを入力してください…"
 
 #: gajim/gtk/change_password.py:173
-#, fuzzy
 msgid "Confirm new password..."
-msgstr "新しいパスワードを再入力"
+msgstr "新しいパスワードを再入力…"
 
 #: gajim/gtk/change_password.py:188
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
 #: gajim/gtk/ssl_error_dialog.py:54
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "There was an error while attempting to verify the SSL certificate of your "
 "XMPP server (%s)."
-msgstr ""
-"XMPP サーバーの SSL 証明書の検証にエラーがあります: %(error)s\n"
-"それでもこのサーバーに接続しますか ?"
+msgstr "XMPP サーバー (%s) の SSL 証明書を検証する際にエラーがありました。"
 
 #: gajim/gtk/ssl_error_dialog.py:57
-#, fuzzy, python-format
+#, python-format
 msgid "Unknown SSL error '%s'"
-msgstr "未知の SSL エラー: %d"
+msgstr "未知の SSL エラー: '%s'"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "新しく会話を開始"
+msgid "Start / Join Chat"
+msgstr "チャットを開始… (_S)"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
-msgstr "接続しないと、グループチャットに参加できません。"
+msgstr "接続しないと、談話室に参加できません。"
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
-msgstr "グループチャットに参加"
-
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-msgid "Add Contact"
-msgstr "相手先を追加"
+msgstr "談話室に参加"
 
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
+"全体的に談話室を検索します\n"
+"(リターンで検索開始)"
 
-#: gajim/gtk/start_chat.py:790
-#, fuzzy, python-format
+#: gajim/gtk/start_chat.py:802
+#, python-format
 msgid "%s group chats found"
-msgstr "%s は見つかりません"
+msgstr "%s の談話室が見つかりました"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "このサービスは、詳細情報の返答がありません"
 
-#: gajim/gtk/discovery.py:70
-#, fuzzy
+#: gajim/gtk/discovery.py:71
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
 msgstr ""
 "このサービスは詳細情報を返答できませんでした。\n"
-"古いか、または壊れています"
+"古いか、または壊れています。"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "その他"
 
-#: gajim/gtk/discovery.py:129
-#, fuzzy
+#: gajim/gtk/discovery.py:130
 msgid "Group Chat"
-msgstr "グループチャット"
+msgstr "談話室"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "接続しないと、サービスを見ることはできません"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "アカウント %s でサービス探索"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "サービス探索"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "サービスが見つかりませんでした"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8692,168 +8459,165 @@ msgstr ""
 "あなたが入力したアドレスにサービスが見つからないか、または応答がありません。"
 "アドレスを確認し、もういちど試してください。"
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "このサービスを見ることはできません"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "サーバー名が正しくありません"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "アカウント %(account)s で %(address)s を閲覧"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr "一覧"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "このサービスには表示すべき項目がありません。"
 
-#: gajim/gtk/discovery.py:1254
-#, fuzzy
+#: gajim/gtk/discovery.py:1255
 msgid "_Command"
-msgstr "コマンド"
+msgstr "コマンド (_C)"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "登録 (_G)"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "検索 (_S)"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "編集 (_E)"
 
-#: gajim/gtk/discovery.py:1456
-#, fuzzy, python-format
+#: gajim/gtk/discovery.py:1457
+#, python-format
 msgid "Scanning %(current)d / %(total)d ..."
-msgstr "走査中 %(current)d / %(total)d.."
+msgstr "走査中 %(current)d / %(total)d..."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "ユーザー数"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "継読中"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "ノード"
 
 # (Mako)pubsubのところ
-#: gajim/gtk/discovery.py:1978
-#, fuzzy
+#: gajim/gtk/discovery.py:1979
 msgid "_New post"
-msgstr "新しい投稿"
+msgstr "新しい投稿 (_N)"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "継読 (_S)"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "継読の取り消し (_U)"
 
-#: gajim/gtk/single_message.py:52
-#, fuzzy
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
-msgstr "単発メッセージを送信…"
+msgstr "単発メッセージを送信"
 
-#: gajim/gtk/single_message.py:103
-#, fuzzy
+#: gajim/gtk/single_message.py:101
 msgid "(No subject)"
-msgstr "件名"
+msgstr "(件名なし)"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "アカウント %s で単発メッセージ"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "アカウント %s で単発メッセージ"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "単発メッセージ"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "%s を送信"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "%s を受信"
 
-#: gajim/gtk/single_message.py:207
-#, fuzzy, python-format
+#: gajim/gtk/single_message.py:205
+#, python-format
 msgid "Characters typed: %s"
-msgstr "使えない文字です"
+msgstr "入力文字数: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "接続していません"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" に接続していることを確認してください。"
 
-#: gajim/gtk/single_message.py:241
-#, fuzzy, python-format
+#: gajim/gtk/single_message.py:239
+#, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
-msgstr "%s さんにメッセージを送れません。JID が正しくありません。"
+msgstr "%s さんにメッセージを送れません。XMPP アドレスが正しくありません。"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
 # (Mako)Personal Eventing via Pubsub
 #: gajim/gtk/pep_config.py:47
-#, fuzzy, python-format
+#, python-format
 msgid "PEP Service Configuration (%s)"
-msgstr "PEP サービスの調整"
+msgstr "PEP サービスの調整 (%s)"
 
 #: gajim/gtk/pep_config.py:76
-#, fuzzy
 msgid "Service"
-msgstr "サーバー"
+msgstr "サービス"
 
 #: gajim/gtk/pep_config.py:113
 msgid "PEP node was not removed"
 msgstr "PEP ノードは削除されませんでした"
 
 #: gajim/gtk/pep_config.py:114
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
-msgstr "PEP ノード %(node)s は削除されませんでした: %(message)s"
+msgstr ""
+"PEP ノード %(node)s は削除されませんでした:\n"
+"%(message)s"
 
 #: gajim/gtk/pep_config.py:145
 #, python-format
@@ -8873,94 +8637,75 @@ msgstr "登録が完了しました"
 msgid "Registration failed"
 msgstr "登録に失敗しました"
 
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "言語 \"%s\" の辞書はありません"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"スペルチェックを使うには、\"%s\" の辞書をインストールしてください。あるいは、"
-"speller_language オプションで別の言語を選択してください。\n"
-"\n"
-"スペル間違いの強調表示は使われません"
-
-#: gajim/gtk/dialogs.py:224
-#, fuzzy
+#: gajim/gtk/dialogs.py:214
 msgid "Certificate"
-msgstr "クライアント証明書"
+msgstr "証明書"
 
-#: gajim/gtk/dialogs.py:238
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:228
+#, python-format
 msgid ""
 "Certificate for \n"
 "%s"
-msgstr "アカウント %s の証明書"
+msgstr ""
+"証明書 \n"
+"%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
-msgstr ""
+msgstr "証明対象\n"
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
-msgstr ""
+msgstr "一般名 (CN):"
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
-msgstr ""
+msgstr "組織 (O): "
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
-msgstr ""
+msgstr "部門 (OU):"
 
-#: gajim/gtk/dialogs.py:291
-#, fuzzy
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
-msgstr "GG 番号"
+msgstr "シリアル番号: "
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
-msgstr ""
+msgstr "証明者\n"
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
-msgstr ""
+msgstr "有効期間\n"
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
-msgstr ""
+msgstr "自: "
 
-#: gajim/gtk/dialogs.py:298
-#, fuzzy
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
-msgstr "保管期限"
+msgstr "至: "
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
-msgstr ""
+msgstr "SHA-1:"
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
-msgstr ""
+msgstr "SHA-256:"
 
-#: gajim/gtk/dialogs.py:314
-#, fuzzy
+#: gajim/gtk/dialogs.py:304
 msgid "Group Chat Invitation "
-msgstr "グループチャットへの招待"
+msgstr "談話室への招待 "
 
-#: gajim/gtk/dialogs.py:336
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:326
+#, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
-msgstr "$Contact さんがあなたをグループチャット %(room_jid)s へ招待しています"
+msgstr ""
+"<b>%(contact)s</b> さんがあなたを談話室 <b>%(room_jid)s</b> へ招待しています"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
@@ -8973,10 +8718,14 @@ msgstr "GG 番号"
 msgid "ICQ Number"
 msgstr "ICQ 番号"
 
+#: gajim/gtk/add_contact.py:42
+msgid "Add Contact"
+msgstr "相手先を追加"
+
 #: gajim/gtk/add_contact.py:260
-#, fuzzy, python-format
+#, python-format
 msgid "%s Missing"
-msgstr "%s MiB"
+msgstr "%s がありません"
 
 #: gajim/gtk/add_contact.py:261
 #, python-format
@@ -8993,9 +8742,8 @@ msgid "The user ID must not contain a resource."
 msgstr "ユーザー ID にはリソースを含めないでください。"
 
 #: gajim/gtk/add_contact.py:300
-#, fuzzy
 msgid "You cannot add yourself to your contact list."
-msgstr "あなた自身は相手先一覧に追加できません。"
+msgstr "自分自身を相手先一覧に追加することはできません。"
 
 #: gajim/gtk/add_contact.py:305
 #, fuzzy
@@ -9007,12 +8755,10 @@ msgid "Your account must be online to add new contacts."
 msgstr "新しい相手先を追加するにはアカウントがオンラインでなければなりません。"
 
 #: gajim/gtk/add_contact.py:322
-#, fuzzy
 msgid "Contact Already in Contact List"
 msgstr "相手先は既に相手先一覧にあります"
 
 #: gajim/gtk/add_contact.py:323
-#, fuzzy
 msgid "This contact is already in your contact list."
 msgstr "この相手先は既に相手先一覧に登録されています。"
 
@@ -9027,7 +8773,7 @@ msgstr "中継先の追加中のエラー"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9040,35 +8786,28 @@ msgid "Write a message…"
 msgstr "メッセージを書いてください…"
 
 #: gajim/gtk/themes.py:37
-#, fuzzy
 msgid "Chatstate Composing"
-msgstr "入力中"
+msgstr "チャット状態・入力中"
 
 #: gajim/gtk/themes.py:41
-#, fuzzy
 msgid "Chatstate Inactive"
-msgstr "停止中"
+msgstr "チャット状態・活動なし"
 
 #: gajim/gtk/themes.py:45
 msgid "Chatstate Gone"
-msgstr "チャット状態が離席"
+msgstr "チャット状態・離席"
 
 #: gajim/gtk/themes.py:49
-#, fuzzy
 msgid "Chatstate Paused"
-msgstr "在席状況を変更する"
+msgstr "チャット状態・停止中"
 
 #: gajim/gtk/themes.py:53
-#, fuzzy
 msgid "Group Chat Tab New Directed Message"
-msgstr ""
-"グループチャットでの\n"
-"指示メッセージ"
+msgstr "自分あての新着メッセージありの談話室タブ"
 
 #: gajim/gtk/themes.py:57
-#, fuzzy
 msgid "Group Chat Tab New Message"
-msgstr "新着メッセージ"
+msgstr "新着メッセージありの談話室タブ"
 
 #: gajim/gtk/themes.py:61
 msgid "Banner Foreground Color"
@@ -9091,9 +8830,8 @@ msgid "Account Row Background Color"
 msgstr "アカウント業の背景色"
 
 #: gajim/gtk/themes.py:81
-#, fuzzy
 msgid "Account Row Font"
-msgstr "アカウントの行"
+msgstr "アカウント行のフォント"
 
 #: gajim/gtk/themes.py:85
 msgid "Group Row Foreground Color"
@@ -9104,9 +8842,8 @@ msgid "Group Row Background Color"
 msgstr "グループ行の背景色"
 
 #: gajim/gtk/themes.py:93
-#, fuzzy
 msgid "Group Row Font"
-msgstr "グループの行"
+msgstr "グループ行のフォント"
 
 #: gajim/gtk/themes.py:97
 msgid "Contact Row Foreground Color"
@@ -9117,15 +8854,13 @@ msgid "Contact Row Background Color"
 msgstr "相手先の行の背景色"
 
 #: gajim/gtk/themes.py:105
-#, fuzzy
 msgid "Contact Row Font"
-msgstr "相手先のサインアウトの通知の色"
+msgstr "相手先の行のフォント"
 
 # (Mako) 語順が問題。コロンでごまかしてみる
 #: gajim/gtk/themes.py:109
-#, fuzzy
 msgid "Conversation Font"
-msgstr "会話中: "
+msgstr "会話のフォント"
 
 #: gajim/gtk/themes.py:113
 msgid "Incoming Nickname Color"
@@ -9168,59 +8903,68 @@ msgid "Highlight Message Color"
 msgstr "強調メッセージの色"
 
 #: gajim/gtk/themes.py:153
-#, fuzzy
 msgid "Message Correcting"
-msgstr "メッセージ複写"
+msgstr "修正メッセージ"
 
 #: gajim/gtk/themes.py:157
-#, fuzzy
 msgid "Contact Disconnected Background"
-msgstr "相手先が切断した"
+msgstr "接続されていない相手先の背景色"
 
 #: gajim/gtk/themes.py:161
-#, fuzzy
 msgid "Contact Connected Background "
-msgstr "相手先が接続した"
+msgstr "接続されている相手先の背景色"
+
+#: gajim/gtk/themes.py:164
+msgid "Status Online Color"
+msgstr "「在席」の色"
+
+#: gajim/gtk/themes.py:167
+msgid "Status Away Color"
+msgstr "「離席中」の色"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:170
+msgid "Status DND Color"
+msgstr "「取り込み中」の色"
+
+#: gajim/gtk/themes.py:173
+msgid "Status Offline Color"
+msgstr "「オフライン」の色"
+
+#: gajim/gtk/themes.py:187
 msgid "Gajim Themes"
 msgstr "Gajim テーマ"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
-#, fuzzy
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 msgid "Invalid Name"
-msgstr "ニックネームが正しくありません"
+msgstr "名前が正しくありません"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr "名前 <b>default</b> は使えません"
 
-#: gajim/gtk/themes.py:213
-#, fuzzy
+#: gajim/gtk/themes.py:225
 msgid "Spaces are not allowed"
-msgstr "使えない文字です"
+msgstr "空白は使えません"
 
-#: gajim/gtk/themes.py:334
-#, fuzzy
+#: gajim/gtk/themes.py:346
 msgid "Do you want to delete this theme?"
-msgstr "本当に、選択したメッセージを削除しますか ?"
+msgstr "本当に、このテーマを削除しますか ?"
 
-#: gajim/gtk/themes.py:336
-#, fuzzy
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
-msgstr "この名前は既に使われています。この状況メッセージを上書きしますか ?"
+msgstr ""
+"このテーマは現在使用中です。\n"
+"このテーマを削除しますか ?"
 
-#: gajim/gtk/themes.py:341
-#, fuzzy
+#: gajim/gtk/themes.py:353
 msgid "Delete Theme"
-msgstr "有効"
+msgstr "テーマを削除"
 
-#: gajim/gtk/themes.py:374
-#, fuzzy
+#: gajim/gtk/themes.py:386
 msgid "Remove Setting"
-msgstr "プラグインの設定"
+msgstr "設定を削除"
 
 #: gajim/gtk/history.py:79
 msgid "Conversation History"
@@ -9241,10 +8985,9 @@ msgid "Error: %s"
 msgstr "エラー: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "エラー"
 
@@ -9258,175 +9001,158 @@ msgstr "現在の状況: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "現在の状況: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "開く"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "新着メール"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 msgid "Clear File"
 msgstr "ファイルを消去"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
 msgstr "プロキシを管理"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
-#, fuzzy
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 msgid "No Proxy"
-msgstr "プロキシ"
+msgstr "プロキシなし"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 msgid "Adjust to Status"
 msgstr "在席状況に合わせる"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "オン"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "オフ"
 
 #: gajim/gtk/remove_account.py:50
-#, fuzzy
 msgid "Removing Account..."
-msgstr "アカウント %s を削除します"
+msgstr "アカウントを削除…"
 
 #: gajim/gtk/remove_account.py:51
 msgid "Trying to remove account..."
-msgstr ""
+msgstr "アカウントを削除します…"
 
 #: gajim/gtk/remove_account.py:54 gajim/gtk/remove_account.py:55
-#, fuzzy
 msgid "Account Removed"
-msgstr "アカウントの行"
+msgstr "アカウントを削除しました"
 
 #: gajim/gtk/remove_account.py:57
-#, fuzzy
-msgid "Your account has has been unregistered successfully."
-msgstr "新しいアカウントを無事に作成しました"
+msgid "Your account has has been removed successfully."
+msgstr "新しいアカウントを無事に削除しました"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
-#, fuzzy
 msgid "Account Removal Failed"
-msgstr "アカウントがありません"
+msgstr "アカウント削除に失敗しました"
 
 #: gajim/gtk/remove_account.py:171 gajim/gtk/remove_account.py:173
-#, fuzzy
 msgid "Remove Account"
-msgstr "アカウント %s を削除します"
+msgstr "アカウントを削除"
 
 #: gajim/gtk/remove_account.py:180
-#, fuzzy
 msgid "This will remove your account from Gajim."
-msgstr "アカウントを Gajim からのみ削除 (_O)"
+msgstr "アカウントを Gajim からします。"
 
 #: gajim/gtk/remove_account.py:189
 #, python-format
 msgid "Do you want to unregister your account on <b>%s</b> as well?"
-msgstr ""
+msgstr "<b>%s</b> でもアカウントを登録抹消しますか ?"
 
 #: gajim/gtk/remove_account.py:198
 msgid "_Unregister account from service"
-msgstr ""
+msgstr "サービスからアカウントを抹消する (_U)"
 
 #: gajim/gtk/remove_account.py:217
-#, fuzzy
 msgid "Account has to be connected"
-msgstr "アカウント \"%s\" はサーバーに接続しています"
+msgstr "アカウントはサーバーに接続されている必要があります"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "履歴を同期"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "どのくらい遡りたいですか ?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "1か月"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "3か月"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "1年"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "すべての期間"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "接続中です..."
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(max)s のうち %(received)s"
 
-#: gajim/gtk/history_sync.py:246
-#, fuzzy, python-format
+#: gajim/gtk/history_sync.py:255
+#, python-format
 msgid "Downloaded %s messages"
 msgstr "%s件のメッセージをダウンロードしました"
 
-#: gajim/gtk/history_sync.py:266
-#, fuzzy, python-format
+#: gajim/gtk/history_sync.py:275
+#, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
-"\n"
-"        履歴の同期が完了しました。\n"
-"        {received}件のメッセージをダウンロードしました。\n"
-"        "
+"履歴の同期が完了しました。\n"
+"%s件のメッセージをダウンロードしました。"
 
-#: gajim/gtk/history_sync.py:270
-#, fuzzy
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
-msgstr ""
-"\n"
-"        Gajim は保存記録と\n"
-"        完全に同期しました。\n"
-"        "
+msgstr "Gajim は保存記録と完全に同期しました。"
 
-#: gajim/gtk/history_sync.py:273
-#, fuzzy
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
-msgstr ""
-"\n"
-"        ただいま同期の作業中です。\n"
-"        後で試してください。\n"
-"        "
+msgstr "ただいま同期の作業中です。後で試してください。"
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:8
 msgid "A GTK XMPP client"
-msgstr "GTK+ XMPP クライアント"
+msgstr "GTK XMPP クライアント"
 
 #: gajim/gtk/about.py:52
-#, fuzzy, python-format
+#, python-format
 msgid "GTK Version: %s"
-msgstr "GTK+ バージョン: %s"
+msgstr "GTK バージョン: %s"
 
 #: gajim/gtk/about.py:53
-#, fuzzy, python-format
+#, python-format
 msgid "GLib Version: %s"
-msgstr "GTK+ バージョン: %s"
+msgstr "GLib バージョン: %s"
 
 #: gajim/gtk/about.py:54
 #, python-format
@@ -9466,139 +9192,128 @@ msgstr "多謝"
 msgid "translator-credits"
 msgstr "Mako N (mako AT pasero.net)"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr "転送するファイルを選択…"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 msgid "Choose Avatar…"
 msgstr "アバターを選択…"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 msgid "PNG files"
 msgstr "PNG ファイル"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 msgid "JPEG files"
 msgstr "JPEG ファイル"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr "SVG ファイル"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "画像"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "書庫の選択"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 msgid "ZIP files"
 msgstr "ZIP ファイル"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr "ファイルの保存…"
 
-#: gajim/gtk/filechoosers.py:179
-#, fuzzy
+#: gajim/gtk/filechoosers.py:180
 msgid "_Open"
-msgstr "開く"
+msgstr "開く (_O)"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
-msgstr "このグループチャットの %(owner_or_admin_or_member)s "
+msgstr "この談話室の %(owner_or_admin_or_member)s "
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "接続中"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "切断中"
 
-#: gajim/gtk/tooltips.py:561
-#, fuzzy
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
-msgstr "ファイル名: %s"
+msgstr "ファイル名: "
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
 msgstr "ダウンロード"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 msgid "?Noun:Upload"
 msgstr "アップロード"
 
-#: gajim/gtk/tooltips.py:577
-#, fuzzy
+#: gajim/gtk/tooltips.py:556
 msgid "?transfer type:Type: "
-msgstr "ファイルの転送が中断しました"
+msgstr "タイプ:"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "一時停止しました"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "一時停止しました"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "説明: "
 
-#: gajim/gtk/tooltips.py:612
-#, fuzzy
+#: gajim/gtk/tooltips.py:591
 msgid "?transfer status:Aborted"
-msgstr "一時停止しました"
+msgstr "中断しました"
 
-#: gajim/gtk/tooltips.py:614
-#, fuzzy
+#: gajim/gtk/tooltips.py:593
 msgid "?transfer status:Completed"
-msgstr "一時停止しました"
+msgstr "完了しました"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "一時停止しました"
 
-#: gajim/gtk/tooltips.py:619
-#, fuzzy
+#: gajim/gtk/tooltips.py:598
 msgid "?transfer status:Stalled"
-msgstr "一時停止しました"
+msgstr "失速しました"
 
-#: gajim/gtk/tooltips.py:623
-#, fuzzy
+#: gajim/gtk/tooltips.py:602
 msgid "?transfer status:Transferring"
-msgstr "一時停止しました"
+msgstr "転送中です"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
-#, fuzzy
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 msgid "?transfer status:Not started"
-msgstr "一時停止しました"
+msgstr "開始していません"
 
 #: gajim/gtk/groupchat_creation.py:101 gajim/gtk/groupchat_creation.py:103
 msgid " (optional)..."
-msgstr ""
+msgstr "(省略可)…"
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
-#, fuzzy
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 msgid "Invalid Address"
-msgstr "ファイルが正しくありません"
+msgstr "アドレスが正しくありません"
 
 #: gajim/gtk/groupchat_creation.py:186
-#, fuzzy
 msgid "Not Connected"
-msgstr "接続中"
+msgstr "接続されていません"
 
 #: gajim/gtk/groupchat_creation.py:187
-#, fuzzy
 msgid "You have to be connected to create a group chat."
-msgstr "グループチャットに参加していません。"
+msgstr "談話室を作成するには、接続されている必要があります。"
 
 #: gajim/gtk/sounds.py:40
 msgid "Wav Sounds"
@@ -9634,35 +9349,34 @@ msgstr "メッセージを送信した"
 
 #: gajim/gtk/sounds.py:80
 msgid "Group Chat Message Highlight"
-msgstr "グループチャットのメッセージの強調"
+msgstr "談話室のメッセージの強調"
 
 #: gajim/gtk/sounds.py:81
 msgid "Group Chat Message Received"
-msgstr "グループチャットのメッセージを受信した"
+msgstr "談話室のメッセージを受信した"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "require(必須)"
 
 # Auto の選択肢
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "する"
 
 # Auto の選択肢
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "しない"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
-#, fuzzy
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 msgid "Cancel"
-msgstr "中止 (_C)"
+msgstr "中止"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
-msgstr ""
+msgstr "送信"
 
 #: gajim/gtk/statusicon.py:200
 msgid "_Change Status Message…"
@@ -9674,14 +9388,8 @@ msgid "using account %s"
 msgstr "アカウント %s で"
 
 #: gajim/gtk/statusicon.py:265
-#, fuzzy
 msgid "Hide _Contact List"
-msgstr "相手先を招待 (_C)"
-
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "アクティブな相手先のみ表示"
+msgstr "相手先一覧を隠す (_C)"
 
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
@@ -9725,272 +9433,238 @@ msgid ""
 "later."
 msgstr "個人情報の公開する際にエラーが発生しました。あとで試してください。"
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s の書庫の設定"
 
-#: gajim/gtk/mam_preferences.py:89
-#, fuzzy
+#: gajim/gtk/mam_preferences.py:99
 msgid "Archiving Preferences Saved"
-msgstr "書庫の設定"
+msgstr "書庫の設定を保存しました"
 
-#: gajim/gtk/mam_preferences.py:90
-#, fuzzy
+#: gajim/gtk/mam_preferences.py:100
 msgid "Your archiving preferences have successfully been saved."
 msgstr "書庫の設定を保存しました。"
 
-#: gajim/gtk/mam_preferences.py:101
-msgid "No response from the Server"
-msgstr "サーバーからの応答がありません"
+#: gajim/gtk/mam_preferences.py:107
+msgid "Archiving Preferences Error"
+msgstr "書庫設定のエラー"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "エラーを受け取りました: {}"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "書庫の設定"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
-msgstr "真"
+msgstr "有効"
 
 #: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
-msgstr "偽"
+msgstr "無効"
 
 #: gajim/gtk/advanced_config.py:97
 msgid "?config type:Boolean"
-msgstr ""
+msgstr "ブール型"
 
 #: gajim/gtk/advanced_config.py:98
 msgid "?config type:Integer"
-msgstr ""
+msgstr "整数型"
 
 #: gajim/gtk/advanced_config.py:99
 msgid "?config type:Text"
-msgstr ""
+msgstr "文字型"
 
 #: gajim/gtk/advanced_config.py:100
 msgid "?config type:Color"
-msgstr ""
+msgstr "色"
 
 #: gajim/gtk/advanced_config.py:112
-#, fuzzy
 msgid "?config:Preference Name"
 msgstr "設定名"
 
 #: gajim/gtk/advanced_config.py:123
-#, fuzzy
 msgid "?config:Value"
-msgstr "調整"
+msgstr "値"
 
 #: gajim/gtk/advanced_config.py:132
 msgid "?config:Type"
-msgstr ""
+msgstr "型"
 
 #: gajim/gtk/advanced_config.py:187
-#, fuzzy
 msgid "?config description:None"
 msgstr "なし"
 
 #: gajim/gtk/advanced_config.py:322
-#, fuzzy
 msgid "?password:Hidden"
-msgstr "パスワード:"
+msgstr "非表示"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
-msgstr ""
+msgstr "サポート"
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
-msgstr ""
+msgstr "セキュリティ"
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
-msgstr ""
+msgstr "フィードバック"
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
-msgstr ""
+msgstr "不正通報"
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
-msgstr ""
+msgstr "セールス"
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s日%(hours)s時間"
 
-#: gajim/gtk/server_info.py:350
-#, fuzzy
+#: gajim/gtk/server_info.py:340
 msgid ""
 "\n"
 "Disabled in preferences"
-msgstr "書庫の設定"
+msgstr ""
+"\n"
+"設定で無効化されています"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "音声/ビデオ"
 
-#: gajim/gtk/features.py:103
-#, fuzzy
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
-msgstr "音声・ビデオチャットを可能にします。"
+msgstr "音声・ビデオチャットを可能にします"
 
-#: gajim/gtk/features.py:104
-#, fuzzy
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
-"gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav および "
-"gstreamer1.0-plugins-ugly が必要です。"
+"gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, gstreamer1.0-"
+"plugins-ugly が必要です。"
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
-#, fuzzy
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
-msgstr "Windows ではこの機能は無効です。"
+msgstr "Windows ではこの機能は無効です"
 
-#: gajim/gtk/features.py:110
-#, fuzzy
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
-msgstr "在席状況を自動的に変更するため、操作のない時間を計測します。"
+msgstr "在席状況を自動的に変更するため、操作のない時間を計測します"
 
-#: gajim/gtk/features.py:112
-#, fuzzy
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
-msgstr "libxss ライブラリが必要です。"
+msgstr "libxss ライブラリが必要です"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
-#, fuzzy
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
-msgstr "Bonjour / Zeroconf"
+msgstr "Bonjour / Zeroconf (サーバーなしのチャット)"
 
-#: gajim/gtk/features.py:117
-#, fuzzy
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 "ローカルなネットワークで自動検出されたクライアントと、サーバーなしのチャット"
-"ができます。"
+"ができます"
 
 # …
-#: gajim/gtk/features.py:119
-#, fuzzy
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
-msgstr "gir1.2-gupnpigd-1.0 が必要です。"
+msgstr "gir1.2-avahi-0.6 が必要です"
 
-#: gajim/gtk/features.py:120
-#, fuzzy, python-format
+#: gajim/gtk/features.py:109
+#, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "pybonjour と実行中の bonjour SDK が必要です (%(url)s)"
 
-#: gajim/gtk/features.py:123
-#, fuzzy
+#: gajim/gtk/features.py:112
 msgid "Location detection"
-msgstr "接続オプション"
+msgstr "位置の検出"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
-#, fuzzy
+#: gajim/gtk/features.py:116
 msgid "Requires: geoclue"
-msgstr "Gspell が必要です。"
+msgstr "geoclue が必要です"
 
-#: gajim/gtk/features.py:128
-#, fuzzy
+#: gajim/gtk/features.py:117
 msgid "Feature is not available under Windows"
-msgstr "Windows ではこの機能は無効です。"
+msgstr "Windows ではこの機能は無効です"
 
-#: gajim/gtk/features.py:130
-#, fuzzy
+#: gajim/gtk/features.py:119
 msgid "Notification Sounds"
-msgstr "通知"
+msgstr "通知音"
 
-#: gajim/gtk/features.py:132
-#, fuzzy
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
-msgstr "音声・ビデオチャットを可能にします。"
+msgstr "さまざまな通知の音を鳴らします"
 
-#: gajim/gtk/features.py:133
-#, fuzzy
+#: gajim/gtk/features.py:122
 msgid "Requires: gsound"
-msgstr "python-dbus が必要です。"
+msgstr "gsound が必要です"
 
-#: gajim/gtk/features.py:136
-#, fuzzy
+#: gajim/gtk/features.py:125
 msgid "Secure Password Storage"
-msgstr "パスワードを保存"
+msgstr "安全なパスワード保存"
 
-#: gajim/gtk/features.py:138
-#, fuzzy
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
-msgstr "パスワードを平文ではないようにして、安全に保存できます。"
+msgstr "パスワードを平文ではないようにして、安全に保存できます"
 
-#: gajim/gtk/features.py:140
-#, fuzzy
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
-"libsecret と、GNOME Keyring や KSecretService のようなマネージャーが必要で"
-"す。"
+#: gajim/gtk/features.py:129
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "gnome-keyring または kwallet が必要です"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
-msgstr ""
+msgstr "安全なパスワード保存に Windows Credential Vault を使用します"
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "スペルチェッカー"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
-msgstr ""
+msgstr "メッセージ作成時にスペルチェックを行います"
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
-#, fuzzy
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
-msgstr "Gspell が必要です。"
+msgstr "Gspell が必要です"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
-msgstr ""
+msgstr "UPnP-IGD ポートフォワーディング"
 
-#: gajim/gtk/features.py:154
-#, fuzzy
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
-msgstr "ファイル転送のフォワードポートのためのルーターの要求を可能にします。"
+msgstr "ファイル転送のフォワードポートのためのルーターの要求を可能にします"
 
 # …
-#: gajim/gtk/features.py:156
-#, fuzzy
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
-msgstr "gir1.2-gupnpigd-1.0 が必要です。"
+msgstr "gir1.2-gupnpigd-1.0 が必要です"
 
-#: gajim/gtk/features.py:217
-#, fuzzy
+#: gajim/gtk/features.py:200
 msgid "Disabled in Preferences"
-msgstr "書庫の設定"
+msgstr "設定で無効化されています"
 
 #: gajim/gtk/privacy_list.py:53
 #, python-format
@@ -10033,52 +9707,45 @@ msgstr "リスト名が正しくありません"
 msgid "You must enter a name to create a privacy list."
 msgstr "プライバシーリストを作成するには、名前を入力してください。"
 
-#: gajim/gtk/groupchat_invite.py:305
-#, fuzzy
+#: gajim/gtk/groupchat_invite.py:304
 msgid "Invite New Contact"
-msgstr "相手先を招待"
+msgstr "新しい相手先を招待"
 
 #: gajim/gtk/groupchat_config.py:134
-#, fuzzy
 msgid "A Group Chat needs at least one Owner"
-msgstr "なし"
+msgstr "談話室には少なくとも1人の主宰者が必要です"
 
 #: gajim/gtk/groupchat_config.py:242
 msgid "You are not allowed to modify the affiliation of Admins and Owners"
-msgstr ""
+msgstr "管理人や主宰者の分掌を変更する権限はありません"
 
 #: gajim/gtk/groupchat_config.py:399
 msgid "An entry with this XMPP Address already exists"
-msgstr ""
+msgstr "この XMPP アドレスは既に登録されています"
 
 #: gajim/gtk/adhoc.py:92
-#, fuzzy
 msgid "Finish"
-msgstr "完了 (_F)"
+msgstr "完了"
 
 #: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
-#, fuzzy
 msgid "Commands"
 msgstr "コマンド"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
-msgstr ""
+msgstr "次へ"
 
 #: gajim/gtk/adhoc.py:110
-#, fuzzy
 msgid "Previous"
-msgstr "妬み"
+msgstr "前へ"
 
 #: gajim/gtk/adhoc.py:116
-#, fuzzy
 msgid "Execute"
-msgstr "コマンドを実行"
+msgstr "実行"
 
 #: gajim/gtk/adhoc.py:196
-#, fuzzy
 msgid "No commands available"
-msgstr "アカウントがありません"
+msgstr "使用できるアカウントはありません"
 
 #: gajim/gtk/adhoc.py:245
 #, fuzzy
@@ -10086,29 +9753,25 @@ msgid "Request Command List"
 msgstr "コマンド実行"
 
 #: gajim/gtk/adhoc.py:260
-#, fuzzy
 msgid "Executing…"
-msgstr "コマンド実行…(_X)"
+msgstr "実行中…"
 
 #: gajim/gtk/adhoc.py:267
-#, fuzzy
 msgid "Command List"
-msgstr "追放者の一覧"
+msgstr "コマンド一覧"
 
 #: gajim/gtk/adhoc.py:385
-#, fuzzy
 msgid "Finished"
-msgstr "完了 (_F)"
+msgstr "完了しました"
 
 #: gajim/gtk/adhoc.py:454
-#, fuzzy
 msgid "Execution failed"
-msgstr "接続に失敗しました"
+msgstr "実行に失敗しました"
 
 #: gajim/gtk/blocking.py:38
-#, fuzzy, python-format
+#, python-format
 msgid "Blocking List for %s"
-msgstr "%s のプライバシーリスト"
+msgstr "%s の追放者一覧"
 
 #: gajim/gtk/blocking.py:72
 msgid "Error!"
@@ -10132,409 +9795,391 @@ msgstr "%s さんから在席通知の申し込み"
 msgid "Loading"
 msgstr "読み込み"
 
-#: gajim/gtk/account_wizard.py:61
-#, fuzzy
+#: gajim/gtk/account_wizard.py:62
 msgid "Connect"
-msgstr "接続中"
+msgstr "接続"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
-msgstr ""
+msgstr "ログイン"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "アカウント作成時にエラーが起きました"
 
-#: gajim/gtk/account_wizard.py:151
-#, fuzzy
+#: gajim/gtk/account_wizard.py:164
 msgid "Creating Account..."
-msgstr "アカウント %s を削除します"
+msgstr "アカウント作成中…"
 
-#: gajim/gtk/account_wizard.py:152
-#, fuzzy
+#: gajim/gtk/account_wizard.py:165
 msgid "Trying to create account..."
-msgstr "アカウントのパスワードを変更するにはクリック"
+msgstr "アカウントを作成しています…"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
-#, fuzzy
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 msgid "Connecting to server..."
-msgstr "接続中です..."
+msgstr "サーバーに接続中です…"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
-#, fuzzy
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr "匿名ログインに対応していません"
+
+#: gajim/gtk/account_wizard.py:366
+msgid "This server does not support anonymous"
+msgstr "このサーバーは匿名に対応していません"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 msgid "Signup not allowed"
-msgstr "使えない文字です"
+msgstr "登録は許可されていません"
 
-#: gajim/gtk/account_wizard.py:319
-#, fuzzy
+#: gajim/gtk/account_wizard.py:382
 msgid "This server does not allow signup."
-msgstr "このサーバーは Vcard をサポートしていません"
+msgstr "このサーバーは登録を許可していません"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
-#, fuzzy
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 msgid "Connection failed"
 msgstr "接続に失敗しました"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
+"サーバーに到達できませんでした。XMPP アドレスが正しいか確認してください。"
 
-#: gajim/gtk/account_wizard.py:391
-#, fuzzy
+#: gajim/gtk/account_wizard.py:454
 msgid "Account is being created"
-msgstr "アカウント \"%s\" はサーバーに接続しています"
+msgstr "アカウントを作成しています"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
-#, fuzzy
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr "サーバーはエラーメッセージなしに登録を拒否しました"
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 msgid "Add Account"
-msgstr "アカウントを追加…"
+msgstr "アカウントを追加"
 
-#: gajim/gtk/account_wizard.py:563
-#, fuzzy
+#: gajim/gtk/account_wizard.py:628
 msgid "Create New Account"
-msgstr "新しい投稿を作成"
+msgstr "新しいアカウントを作成"
 
-#: gajim/gtk/account_wizard.py:622
-#, fuzzy
+#: gajim/gtk/account_wizard.py:687
 msgid "Must be a port number"
-msgstr "ポートは番号で指定してください。"
+msgstr "ポート番号が必要です"
 
-#: gajim/gtk/account_wizard.py:629
-#, fuzzy
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
-msgstr "リソースは1文字以上1023文字以下にしてください"
+msgstr "ポート番号は0から65525のあいだの数値でなければなりません"
 
-#: gajim/gtk/account_wizard.py:666
-#, fuzzy
+#: gajim/gtk/account_wizard.py:731
 msgid "Advanced settings"
-msgstr "チャットのショートカット"
+msgstr "詳細設定"
 
-#: gajim/gtk/account_wizard.py:708
-#, fuzzy
+#: gajim/gtk/account_wizard.py:777
 msgid "Security Warning"
-msgstr "警告: %s"
+msgstr "セキュリティ警告"
 
-#: gajim/gtk/account_wizard.py:727
-#, fuzzy, python-format
+#: gajim/gtk/account_wizard.py:796
+#, python-format
 msgid "Unknown TLS error '%s'"
-msgstr "未知の SSL エラー: %d"
+msgstr "未知の TLS エラー: '%s'"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
-#, fuzzy
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 msgid "Create Account"
-msgstr "アカウント %s を削除します"
+msgstr "アカウントを作成"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
-msgstr ""
+msgstr "リダイレクト"
 
-#: gajim/gtk/account_wizard.py:823
-#, fuzzy
+#: gajim/gtk/account_wizard.py:895
 msgid "Register on the Website"
-msgstr "%s を登録"
+msgstr "ウェブサイトで登録"
 
-#: gajim/gtk/account_wizard.py:834
-#, fuzzy
+#: gajim/gtk/account_wizard.py:906
 msgid "Account Added"
-msgstr "アカウントの行"
+msgstr "アカウントを追加しました"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "アカウントは無事に追加されました"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
-#, fuzzy
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 msgid "All Accounts"
-msgstr "アカウント"
+msgstr "すべてのアカウント"
 
 #: gajim/gtk/xml_console.py:170
-#, fuzzy, python-format
+#, python-format
 msgid "Please make sure you are connected with '%s'."
-msgstr "\"%s\" に接続していることを確認してください。"
+msgstr "'%s' に接続していることを確認してください。"
 
 #: gajim/gtk/xml_console.py:180
-#, fuzzy
 msgid "Invalid Node"
-msgstr "ファイルが正しくありません"
+msgstr "ノードが正しくありません"
 
 #: gajim/gtk/search.py:95 gajim/gtk/search.py:191
 msgid "Search"
 msgstr "検索"
 
 #: gajim/gtk/search.py:101
-#, fuzzy
 msgid "New Search"
-msgstr "検索"
+msgstr "新しい検索"
 
 #: gajim/gtk/search.py:176
 msgid "Request Search Form"
 msgstr ""
 
 #: gajim/gtk/search.py:236
-#, fuzzy
 msgid "Search…"
-msgstr "検索"
+msgstr "検索…"
 
 #: gajim/gtk/search.py:243
-#, fuzzy
 msgid "Search Result"
-msgstr "検索"
+msgstr "検索結果"
 
 #: gajim/gtk/search.py:250
-#, fuzzy
 msgid "No results found"
 msgstr "見つかりません"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
-msgstr ""
+msgstr "音声/ビデオの依存がありません"
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "デフォルト"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
+"<span color=\"red\" font-weight=\"bold\">無効</span>です。ビデオに対応してい"
+"ないようです。"
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "状況メッセージのタイトル"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "状況メッセージの文"
 
-#: gajim/gtk/accounts.py:119
-#, fuzzy
+#: gajim/gtk/accounts.py:122
 msgid "Re-Login"
-msgstr "ログイン"
+msgstr "再ログイン"
 
-#: gajim/gtk/accounts.py:120
-#, fuzzy
+#: gajim/gtk/accounts.py:123
 msgid "Re-Login now?"
 msgstr "今すぐ再ログインしますか ?"
 
-#: gajim/gtk/accounts.py:121
-#, fuzzy
+#: gajim/gtk/accounts.py:124
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "すべての変更を直ちに有効にするには、再ログインしてください。"
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
-msgstr ""
+msgstr "後で (_L)"
 
-#: gajim/gtk/accounts.py:125
-#, fuzzy
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
-msgstr "ログイン"
+msgstr "再ログイン (_R)"
 
-#: gajim/gtk/accounts.py:483
-#, fuzzy
+#: gajim/gtk/accounts.py:492
 msgid "Please check if Bonjour is installed."
-msgstr "Avahi か Bonjour がインストールされているか確認してください。"
+msgstr "Bonjour がインストールされているか確認してください。"
 
-#: gajim/gtk/accounts.py:485
-#, fuzzy
+#: gajim/gtk/accounts.py:494
 msgid "Please check if Avahi is installed."
-msgstr "Avahi か Bonjour がインストールされているか確認してください。"
+msgstr "Avahi がインストールされているか確認してください。"
 
-#: gajim/gtk/accounts.py:520
-#, fuzzy
+#: gajim/gtk/accounts.py:533
 msgid "Disable Account"
-msgstr "アカウントが正しくありません"
+msgstr "アカウントを無効化"
 
-#: gajim/gtk/accounts.py:521
-#, fuzzy, python-format
+#: gajim/gtk/accounts.py:534
+#, python-format
 msgid "Account %s is still connected"
-msgstr "アカウント \"%s\" はサーバーに接続しています"
+msgstr "アカウント %s はまだサーバーに接続中です"
 
-#: gajim/gtk/accounts.py:522
-#, fuzzy
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
-msgstr "すべてのチャットとグループチャットのウィンドウを閉じます。続けますか ?"
+msgstr "すべてのチャットと談話室のウィンドウを閉じます。"
 
-#: gajim/gtk/accounts.py:526
-#, fuzzy
+#: gajim/gtk/accounts.py:539
 msgid "_Disable Account"
-msgstr "アカウントが正しくありません"
+msgstr "アカウントを無効化 (_A)"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr "ラベル"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr "アカウントを色で識別します"
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr "ログイン"
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "相手先をインポート"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-msgid "Client Certificate"
-msgstr "クライアント証明書"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 msgid "Connect on startup"
 msgstr "起動時に接続する"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 msgid "Save conversations for all contacts"
 msgstr "すべての相手先の会話記録を保存する"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
-msgstr "ハードドライブに会話を保存"
+msgstr "ハードドライブに会話を保存します"
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 msgid "Global Status"
 msgstr "全体の在席状況"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 msgid "Synchronise the status of all accounts"
 msgstr "すべてのアカウントの在席状況を同期します"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "ファイル転送のプロキシを使う"
 
-#: gajim/gtk/accounts.py:635
-#, fuzzy
+#: gajim/gtk/accounts.py:654
 msgid "Idle Time"
-msgstr "操作のない状態(いつから):"
+msgstr "操作のない時間"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
-msgstr ""
+msgstr "最後に操作してからの時間を公表します"
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
-msgstr ""
+msgstr "ローカルのシステム時刻"
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
-msgstr ""
+msgstr "Gajim を実行しているデバイスのシステム時刻を公表します"
 
-#: gajim/gtk/accounts.py:644
-#, fuzzy
+#: gajim/gtk/accounts.py:663
 msgid "Client / Operating System"
-msgstr "クライアント証明書"
+msgstr "クライアント / オペレーティングシステム"
 
-#: gajim/gtk/accounts.py:646
-#, fuzzy
+#: gajim/gtk/accounts.py:665
 msgid ""
-"Disclose informations about the client and operating system you currently use"
-msgstr "Gajim が使用中の OS を通知することを許可します。"
+"Disclose information about the client and operating system you currently use"
+msgstr "クライアントと現在使用中のオペレーティングシステムの情報を公表します"
 
-#: gajim/gtk/accounts.py:649
-#, fuzzy
+#: gajim/gtk/accounts.py:668
 msgid "Ignore Unknown Contacts"
-msgstr "相手先を招待"
+msgstr "未知の相手先を無視"
 
-#: gajim/gtk/accounts.py:651
-#, fuzzy
+#: gajim/gtk/accounts.py:670
 msgid "Ignore everything from contacts not in your Roster"
-msgstr "相手先一覧にない相手先からのイベントを無視する (_I)"
+msgstr "相手先一覧にない相手先からのすべてを無視します"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr "サーバーのホスト名を手動で設定する"
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr "優先順位"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 msgid "Use environment variable"
 msgstr "環境変数を使う"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 msgid "Synchronize the status of all accounts"
 msgstr "すべてのアカウントの在席状況を同期します"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 msgid "First Name"
 msgstr "名"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 msgid "Last Name"
 msgstr "姓"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 msgid "Email"
 msgstr "メール"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 msgid "Adjust to status"
 msgstr "在席状況に合わせる"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "有効"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 msgid "Port"
 msgstr "ポート番号"
 
-#: gajim/gtk/accounts.py:788
-#, fuzzy
+#: gajim/gtk/accounts.py:807
 msgid "Connection Settings"
-msgstr "接続オプション"
+msgstr "接続設定"
+
+#: gajim/gtk/accounts.py:815
+msgid "Client Certificate"
+msgstr "クライアント証明書"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PKCS12 形式のファイル"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 msgid "Encrypted Certificate"
 msgstr "暗号化された証明書"
 
-#: gajim/gtk/accounts.py:804
-#, fuzzy
+#: gajim/gtk/accounts.py:823
 msgid "Certificate Settings"
-msgstr "証明書オプション"
+msgstr "証明書の設定"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 msgid "Save Password"
 msgstr "パスワードを保存"
 
-#: gajim/gtk/accounts.py:824
-#, fuzzy
+#: gajim/gtk/accounts.py:843
 msgid "Login Settings"
-msgstr "プラグインの設定"
+msgstr "ログイン設定"
 
 #: gajim/gtk/roster_item_exchange.py:49
-#, fuzzy, python-format
+#, python-format
 msgid "<b>%s</b> would like to add some contacts to your contact list."
-msgstr "あなたを私の相手先リストに追加したいと思います。"
+msgstr ""
+"<b>%s</b> さんが、あなたの相手先一覧にいくつかの相手先を追加するよう、求めて"
+"います。"
 
 #: gajim/gtk/roster_item_exchange.py:52
-#, fuzzy, python-format
+#, python-format
 msgid "<b>%s</b> would like to modify some contacts in your contact list."
 msgstr ""
-"<b>%(jid)s</b> さんは、あなたの相手先一覧にあるいくつかの相手先に <b>"
-"%(action)s</b> を行うよう、求めています。"
+"<b>%s</b> さんが、あなたの相手先一覧にあるいくつかの相手先を変更するよう、求"
+"めています。"
 
 #: gajim/gtk/roster_item_exchange.py:55
-#, fuzzy, python-format
+#, python-format
 msgid "<b>%s</b> would like to delete some contacts from your contact list."
 msgstr ""
-"<b>%(jid)s</b> さんは、あなたの相手先一覧にあるいくつかの相手先に <b>"
-"%(action)s</b> を行うよう、求めています。"
+"<b>%s</b> さんが、あなたの相手先一覧にあるいくつかの相手先を削除するよう、求"
+"めています。"
 
 #: gajim/gtk/roster_item_exchange.py:73 gajim/gtk/roster_item_exchange.py:161
 msgid "Modify"
@@ -10549,7 +10194,7 @@ msgid "Groups"
 msgstr "グループ"
 
 #: gajim/gtk/roster_item_exchange.py:196
-#, fuzzy, python-format
+#, python-format
 msgid "%s suggested me to add you to my contact list."
 msgstr "あなたを相手先一覧に追加するよう、%s さんは私に勧めました。"
 
@@ -10567,19 +10212,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d 件の相手先を削除しました"
 msgstr[1] "%d 件の相手先を削除しました"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "不明"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "不明"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "不明"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10589,24 +10234,24 @@ msgstr ""
 "( <i>%(source)s</i> より)"
 
 #: gajim/gtk/bookmarks.py:48
-#, fuzzy, python-format
+#, python-format
 msgid "Bookmarks for %s"
-msgstr "ブックマーク"
+msgstr "%s のブックマーク"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "書庫が壊れています"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "書庫が空です"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "書庫の形式が正しくありません"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "プラグインは既に存在しています"
@@ -10639,9 +10284,8 @@ msgid "Overwrite Plugin?"
 msgstr "プラグインを上書きしますか ?"
 
 #: gajim/plugins/gui.py:289
-#, fuzzy
 msgid "Do you want to overwrite the currently installed version?"
-msgstr "招待に応じますか ?"
+msgstr "現在インストールされているバージョンを上書きしますか ?"
 
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "XMPP IM Client"
@@ -10657,11 +10301,10 @@ msgid "org.gajim.Gajim"
 msgstr "org.gajim.Gajim"
 
 #: data/org.gajim.Gajim.desktop.in:27
-#, fuzzy
 msgid "Show next pending event"
-msgstr "すべての保留イベントの表示 (_E)"
+msgstr "次のの保留イベントを表示"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
@@ -10671,118 +10314,249 @@ msgstr ""
 "サーバー(たとえば Jabber.org など) や中継(たとえばFacebook や IRC など)をとお"
 "してチャットできます。"
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 "友人や家族と会話はもちろん、画像を送ったりグループで議論したりもできます。"
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr "Gajimは他のデバイスとよく連携します。モバイル端末で送受しても大丈夫。"
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 msgid "Features:"
 msgstr "機能:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr "他のクライアントと同期し、メッセージを取りこぼしません"
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
-msgstr "グループチャットへの招待と参加"
+msgstr "談話室への招待と参加"
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr "友人やグループへの画像・動画やその他のファイルの簡単な送信"
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
-msgstr ""
+msgstr "OMEMO または OpenPGP での端末間暗号化による安全なチャット"
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr "お好みの絵文字の利用、プロフィール画像の設定"
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr "すべての会話記録の保存と管理"
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr "チャットウィンドウをタブでまとめ"
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
-msgstr "入力するメッセージのスペルチェックをします。"
+msgstr "入力メッセージの自動スペルチェック"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr "中継による他のメッセンジャー(Facebook, IRC, ...)への接続"
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr "チャットウィンドウから直接 Wikipedia や辞書その他の検索エンジンの利用"
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr "友人にどうしているかを知らせるため、動向・聴いている楽曲・気分を設定"
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr "複数アカウントに対応"
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr "一人の相手の複数の連絡先をグループ化(メタ相手先)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr "プロトコル層で何が起こったか確認できる XML コンソール"
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
-msgstr "リンクローカル (bonjour / zeroconf), BOSH"
+msgstr "サーバーなしのメッセージング (bonjour / zeroconf)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
-msgstr "ノードやユーザー検索などのサービス探索"
+msgstr "ノードやユーザー検索などのサービス探索に対応"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr "プラグインによる機能拡張"
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 msgid "Contact list"
 msgstr "相手先一覧"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr "タブ化チャットウィンドウ"
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 msgid "Group chat support"
-msgstr "グループチャットに対応"
+msgstr "談話室に対応"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Chat history"
 msgstr "会話の履歴"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 msgid "Plugin manager"
 msgstr "プラグイン管理"
 
+#~ msgid "Start New Conversation"
+#~ msgstr "新しく会話を開始"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "接続の喪失を模する"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "接続の回復を模する"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "未知の SSL エラー: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "libsecret と、GNOME Keyring や KSecretService のようなプロバイダーが必要で"
+#~ "す"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "操作しない状態をチェックする時間間隔。"
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "言語 \"%s\" の辞書はありません"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "スペルチェックを使うには、\"%s\" の辞書をインストールしてください。あるい"
+#~ "は、speller_language オプションで別の言語を選択してください。\n"
+#~ "\n"
+#~ "スペル間違いの強調表示は使われません"
+
+#~ msgid "_Reconnect"
+#~ msgstr "再接続 (_R)"
+
+#~ msgid "Quit"
+#~ msgstr "終了"
+
+#~ msgid "Show Contact List"
+#~ msgstr "相手先一覧を表示"
+
+#~ msgid "Add to Contact List"
+#~ msgstr "相手先一覧に追加"
+
+#~ msgid "Invite Contact"
+#~ msgstr "相手先を招待"
+
+#~ msgid "Configure Group Chat"
+#~ msgstr "グループチャットを調整"
+
+#~ msgid "Destroy Group Chat"
+#~ msgstr "グループチャットを閉鎖"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "真なら、Gajim は未読メッセージのあるタブにアイコンを表示します。テーマに依"
+#~ "存し、アイコンが動画のものもあります。"
+
+#~ msgid "Show a mini avatar in chat window tabs and as the window's icon."
+#~ msgstr ""
+#~ "チャットウィンドウとウィンドウアイコンに小さなアバターを表示します。"
+
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "チャットのタブにアバターを表示する"
+
+#~ msgid "If checked, the contact's avatar will be shown in chat tabs"
+#~ msgstr "チェックをつけると、チャットのタブに相手先のアバターを表示します"
+
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "サーバー名は1文字以上1023文字以下にしてください"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "ホスト名に不正な文字が含まれています。"
+
+#~ msgid "Server address required."
+#~ msgstr "サーバーのアドレスが必要です。"
+
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "ユーザー名は1文字以上1023文字以下にしてください"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "ユーザー名に不正な文字が含まれています。"
+
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "リソースは1文字以上1023文字以下にしてください"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "リソースに不正な文字が含まれています。"
+
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "相手先のサインインの通知の色"
+
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "相手先のサインアウトの通知の色"
+
+#~ msgid "Notification color for new message notification."
+#~ msgstr "新着メッセージ通知の色。"
+
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "ファイル転送要求の通知の色。"
+
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "ファイル転送エラーの通知の色。"
+
+#~ msgid "Notification color for stopped or completed file transfers."
+#~ msgstr "ファイル転送の中止または完了の通知の色"
+
+#~ msgid "Notification color for group chat invitations."
+#~ msgstr "談話室への招待の通知の色"
+
+#~ msgid "Notification background color for changed status."
+#~ msgstr "在席状況変更の通知の背景色"
+
+#~ msgid "Event Type"
+#~ msgstr "イベントの種類"
+
+#~ msgid "Event desc"
+#~ msgstr "イベントの説明"
+
+#~ msgid "HTTP File Upload: Enable HTTPS Verification."
+#~ msgstr "HTTP ファイルアップロード: HTTPS 検証を有効化。"
+
+#~ msgid "No response from the Server"
+#~ msgstr "サーバーからの応答がありません"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "リソースの衝突"
 
@@ -11444,9 +11218,6 @@ msgstr "プラグイン管理"
 #~ msgid "_Send Private Message"
 #~ msgstr "私信を送る (_S)"
 
-#~ msgid "Send _File"
-#~ msgstr "ファイルを送信 (_F)"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "参加者"
@@ -14028,10 +13799,6 @@ msgstr "プラグイン管理"
 #~ msgid "Autodetection of network status."
 #~ msgstr "ネットワークの状態を自動検出します。"
 
-#, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "gnome-network-manager と python-dbus が必要です。"
-
 #~ msgid "Feature not available, see Help->Features"
 #~ msgstr "この機能は無効です。ヘルプ->機能を見てください。"
 
@@ -14364,9 +14131,6 @@ msgstr "プラグイン管理"
 #~ "ポートを指定できます。\n"
 #~ "ファイアーウォールの設定を考慮してください。"
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "アカウントを統合 (_G)"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP はこのコンピュータでは使えません。"
 
diff --git a/po/kk.po b/po/kk.po
index 55f955304..e7a7406fa 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim.trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2011-02-03 14:51+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
@@ -19,77 +19,83 @@ msgstr ""
 "X-Poedit-Language: Kazakh\n"
 "X-Poedit-Country: KAZAKHSTAN\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Тіркелгілер"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "аутентификацияланған"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "аутентификацияланБАған"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s түрдегі шифрлену %(status)s және %(authenticated)s.\n"
 "Сөйлесу сессия тарихыңыз %(logged)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Суретті таңдау"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Сіз бірнеше чатты жабуды таңдадыңыз"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "\"%s\" топ чатынан шығуды шынымен қалайсыз ба?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "М_ені қайта сұрамау"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Жекелік тізімі"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "%s банға жіберу"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 "Егер сіз файлды %s-қа жіберсеңіз, ол сіздің шын Jabber ID-ді білетін болады."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "Жалға_стыру"
 
@@ -153,500 +159,495 @@ msgstr "Кезекте жазылуға сұранымдар жоқ."
 msgid " resource with priority "
 msgstr " ресурс приоритеті"
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Желіде _еместерді көрсету"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Мен сізді өзімнің контакттар тізіміне қосқым келеді."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Бі_р хабарламаны жіберу..."
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "К_оманда орындау"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Транспортты басқару"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "Тр_анспортты басқару"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "Атын ауысты_ру"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "Б_локтамау"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Блоктау"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Ө_шіру"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Ақпараты"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "_Файлды жіберу"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Файлды қалайша сақтау..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Файлды қалайша сақтау..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Соңғы қалып-күйі: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Контакттарды _шақыру"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Контакт қосу..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Дауыс чатына сұраным"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Видео сынау"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Ақпараты"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "Тар_ихы"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Сөндірулі"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Тек жазу"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Барлық чат күйлері"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Контакттарды _шақыру"
+msgid "All Chat States"
+msgstr "Барлық чат күйлері"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Топ чаттардан шығу"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Топ чаттардан шығу"
+msgid "Rename…"
+msgstr "Атын ауысты_ру"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "_Тақырыпты өзгерту..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Топ чаттардан шығу"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Архивті таңдаңыз"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Жаңа чат бөлмесі"
+msgid "Configure…"
+msgstr "Баптау"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Өшірілуде %s"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Плагиндер"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Орнатылған хабарламалар:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Жабылғанда, ростерге орналастыру"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Авто кір_генде қайыру"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "_Никті өзгерту..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Даусы бар"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "К_оманда орындау"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i күн бұрын"
 msgstr[1] "%i күн бұрын"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Тек жазу"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Барлық чат күйлері"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Контакт қосу..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Бі_р хабарламаны жіберу..."
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "Қы_зметтерді қарап шығу"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Кеңейтілген"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Архивтеу ба_птауларын түзету"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Блок тізім"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Бетбелгі"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Баптаулар"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Синхрондау"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Жекелік тізімдер"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "Ә_кімші"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Сервер хабарламасын жіберу..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "MOTD орнату..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "MOTD жаңарту..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "MOTD өшіру"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Контакт қосу..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Тіркелгіні тү_зету"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Тіркелгіні тү_зету"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Тіркелгілер"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "JID/Email _адресін көшіру"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Бөлмеге кіру"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Чатты бастау"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Контакт қосу..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Сілтеме адресін көшіру"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Сіл_темені браузерде ашу"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "JID/Email _адресін көшіру"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "Email қ_олданбасын ашу"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Сілтеме адресін көшіру"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Орналасуы: %s"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "JID/Email _адресін көшіру"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "_Шақыру"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "Б_локтамау"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Блоктау"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Тебу"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Бан"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Иесі"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "Ә_кімші"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Мүше"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Мүше"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Даусы бар"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Бөлме JID-і"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "хабарлама"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Сма_йликтер:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Тарих логтар дерекқоры табылмады"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Файл жоқ"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM адресі:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Уақыты"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -654,29 +655,29 @@ msgstr "Уақыты"
 msgid "Nickname"
 msgstr "Ник аты"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Хабарлама"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Тақырып"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Дерекқор қатесі"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "кэш дерекқорын жасау"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -688,190 +689,190 @@ msgstr ""
 "шертіңіз.\n"
 "ИӘ шертсеңіз, күте тұрыңыз..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Тазарт_у"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Сіз"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s уақытында %(who)s айтқан: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Өшіру"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Растауды тайдыру"
 msgstr[1] "Растауды тайдыру"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Ерекшеленген хабарламаны өшіруді шынымен қалайсыз ба?"
 msgstr[1] "Ерекшеленген хабарламаны өшіруді шынымен қалайсыз ба?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Хабарлама"
 msgstr[1] "Хабарлама"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Ерекшеленген хабарламаны өшіруді шынымен қалайсыз ба?"
 msgstr[1] "Ерекшеленген хабарламаларды өшіруді шынымен қалайсыз ба?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Контакт аты: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Жалпы"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Топ"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Топта"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Көңіл-күйді орнату"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s күй хабарламасы"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Күй хабарламасы"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 #, fuzzy
 msgid "Overwrite"
 msgstr "Үстінен жазу керек пе?"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Күй хабарламасын алмастыру керек пе?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Бұл атау қолдануда. Бұл қалып-күй хабарламасын алмастыруды қалайсыз ба?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Үстінен жазу керек пе?"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Күй хабарламасы"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Орнатылған етіп сақтау..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr " Бұл қалып-күй хабарламасы үшін атын енгізіңіз"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Бар "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Күй"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Сервермен байланысты орнатқан жоқсыз"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Байланыс орнатылмаса, контакттарды синхрондай алмайсыз."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Аты"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Бұл тіркелгі серверге байланыс орнатылмаған"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Байланыспаған тіркелгімен синхрондай алмайсыз."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Синхрондау"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "аудио мен видео"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "аудио"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "видео"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -880,95 +881,100 @@ msgstr ""
 "%(contact)s сізбен %(type)s сессияны бастағысы келеді. Қоңырау соғуға жауап "
 "бересіз бе?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "_Файлды жіберу"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Файлды қалайша сақтау..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Қате файл"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "%s тебілуде"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Блок тізім"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Ник кірістіру"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Дауыс чатына сұраным"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 #, fuzzy
 msgid "_Approve"
 msgstr "approve"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s тақырыпты %(subject)s етіп орнатқан"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетеді"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетпейді"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Бұл сессия серверде САҚТАЛАДЫ"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Сіз туралы ақпарат, серверде сақталған түрде"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Бөлме енді анонимды емес"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Бөлме енді жартылай анонимды"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Бөлме енді толық анонимды"
@@ -983,7 +989,7 @@ msgstr "Pong! (%s сек.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Қате."
 
@@ -1012,22 +1018,22 @@ msgstr "Жаңа бөлме жасалған"
 msgid "Failed to Configure Group Chat"
 msgstr "Топ чаттардан шығу"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Бұдан былай %s ретінде белгілі боласыз"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s енді %(new_nick)s ретінде белгілі болады"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Бұдан былай %s ретінде белгілі боласыз"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s қазір %(status)s"
@@ -1153,81 +1159,81 @@ msgstr "\"%s\" топ чатынан шығуды шынымен қалайсы�
 msgid "If you close this window, you will leave '%s'."
 msgstr "Бұл терезені жапсаңыз, топ чатынан шығасыз."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Пішімдеулер тізімін көрсету"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Контакт файлдармен алмасуды қолдамайды."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s қалып-күйі : %(state)s, себебі: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s, %(room_name)s топ чатынан"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Бұл сертификат үшін осы қатені елемеу."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Сіз жаңа ғана \"%s\" жіберген жаңа хабарламаны алдыңыз"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Жіберу мен жабу"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Жаңа хабарлама"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Жіберу мен жабу"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1236,188 +1242,179 @@ msgstr ""
 "Тақырыбы: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s қазір %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Файлдармен алмасу"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Өлшемі: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_Тіркелгілер"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Желі_де емес"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Орналасқан буманы ашу"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Топ чатына шақыру"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Қашықтағы контакт файлдармен алмасуды тоқтатқан"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Файлды ашу қатесі"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Файлдармен алмасу тоқтатылды"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Файлдармен алмасу тоқтатылды"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Тораппен байланысты орнату мүмкін емес."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Жүйелік сөре таңбашасын көрсету:"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Тек ростерде көрсету"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Кеңейтілген баптаулар түзетушісі"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s баптау қатесі"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 #, fuzzy
 msgid "Configure logging system"
 msgstr "%s баптау"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Қат_ыспаған оқиғаларды көрсету"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Келесі кезектегі оқиға бар қалқымалы терезені көрсетеді"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Чатты бастау"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Дерекқор қатесі"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Біріктірілген тіркелгілер"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Қызметтер"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Топтық чаттар"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Авторизация жіберілді"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "\"%s\" енді сіздің қалып-күйіңізді біле алады."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Жазылуға сұраным жіберілді"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Егер \"%s\" сіздің сұранымыңызды қабылдаса, сіз оның қалып-күйін біле аласыз."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Авторизация өшірілді"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" енді сізді әрқашан желіде емес күйінде көреді."
@@ -1427,7 +1424,7 @@ msgstr "\"%s\" енді сізді әрқашан желіде емес күйі
 msgid "desynced"
 msgstr "байланыспаған"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1447,7 +1444,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Gajim-ді әрқашан жабу"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Шығу"
@@ -1605,8 +1603,8 @@ msgstr "Топ атын ауыстыру"
 msgid "Please enter a new name"
 msgstr "Өзіңіз таңдаған аты бар жаңа теманы жасаңыз."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Аты_н ауыстыру"
@@ -1625,27 +1623,32 @@ msgstr "Сіз ростерден %s тобын өшіруді қалайсыз
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Сонымен қатар ростерден осы топтың барлық контакттарын өшіру"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Топ чаттардан шығу"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Жергілікті тіркелгіңіз үшін жаңа пайдаланушы атын енгізіңіз"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Ростерден контактты өшіреді"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Сіз \"%(name)s\" (%(jid)s) ростеріңізден өшіруді қалағансыз.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1655,21 +1658,21 @@ msgstr ""
 "оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес "
 "сияқты көреді."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Жалғастыруды қалайсыз ба?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Өшіруден кейін осы контакттар менің қалып-күйімді білуін қалаймын"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Ростерден контактты өшіреді"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1681,24 +1684,24 @@ msgstr ""
 "оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес "
 "сияқты көреді."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Бірде-бір тіркелгі қолжетерсіз"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Басқа контакттармен сөйлесу үшін алдымен тіркелгіні жасауыңыз қажет."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Метаконтакттарды сақтау серверіңіз қолдамайды"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1707,12 +1710,12 @@ msgstr ""
 "Серверінің метаконтакттар ақпаратын сақтауды қолдамайды. Сол үшін, бұл "
 "ақпарат келесі рет қосылғаны үшін сақталмайды."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Метаконтакт жасауды қалағансыз. Жалғастырамыз ба?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1722,121 +1725,122 @@ msgstr ""
 "Метаконтакт - бірнеше бірлік контактты бір жолға біріктіру тәсілі. Әдетте ол "
 "бір адамның бірнеше Jabber не транспорт тіркелгілері бар болса қолданылады."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Жасампаз"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Файл URI қате:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Бұл файлды %s үшін жіберуді қалайсыз ба:"
 msgstr[1] "Бұл файлдарды %s үшін жіберуді қалайсыз ба:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Жіберу"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "%s қазір %s үшін жіберу"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s бірінші контакт қылу"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%s және %s метаконтакт жасау"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Өленді жариялау"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Орналасуды жариялау"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "Бар_лығын жазу"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Топ ү_шін хабарлама жіберу"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Барлық пайдаланушыларға"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Барлық желідегі пайдаланушыларға"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Шақыру"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Контакттарды басқару"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Топтар_ды түзету"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "Өші_ру"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Максималды қылу"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Аты_н ауыстыру"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "Қа_йта байланысу"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "К_оманда орындау"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "Тар_ихы"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Тарихты басқару"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Байқаушылар"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1965,70 +1969,70 @@ msgstr "Жеке чаттар"
 msgid "Messages"
 msgstr "Хабарламалар"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) %(url)s үшін авторизация (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Бұл сұранымды қабылдайсыз ба?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "%s тіркелгісіндегі бұл сұранымды қабылдайсыз ба?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Авторизация жіберілді"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Авторизация жіберілді"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Жоқ"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Байланысу сәтсіз"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s жіберу кезіндегі қате ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Жазылуға сұраным"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Авторизация қабылданды"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "\"%s\" контакты өз қалып-күйін көруге сізге авторизация берген."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Жазылуға сұраным"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "\"%s\" контакты сізден өзіне жазылуды өшіріп тастаған"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2037,150 +2041,150 @@ msgstr ""
 "Сіз енді оны әрқашан да желіде емес ретінде көресіз.\n"
 "Оны өз контакттар тізіміңізден өшіруді қалайсыз ба?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Жазылмаған"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Сізді топтық чатқа шақырған"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сертификат мерзімі біткен"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 "%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s тіркелгіңіз үшін парольді енгізіңіз"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Пароль керек"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Парольді сақтау"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Файл алмасу қатесі"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s сізге файлды жібергісі келеді:"
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Файл алмасуға сұраным"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Қашықтағы контакт файлдармен алмасуды тоқтатқан"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Файлды ашу қатесі"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL сертификат қатесі"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Файл алмасу тоқтатылған"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Сіз %(filename)s файлын %(name)s үшін сәтті жібердіңіз."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Пайдаланушы аттардың ерегісуі"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Жергілікті тіркелгіңіз үшін жаңа пайдаланушы атын енгізіңіз"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_ОК"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s сізбен дауыс чатын бастағысы келеді."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Дауыс чатына сұраным"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Қауіпсіз емес байланыс"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2191,20 +2195,20 @@ msgstr ""
 "барлық сөйлесулеріңіз шифрленбеген түрде жүреді. Осыны жасауды шынымен "
 "қалайсыз ба?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Байланыс орнату"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Баптауларыңызды сақтау мүмкін емес"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2408,11 +2412,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard жариялануы қатемен аяқталды"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Жеке хабарламаны жіберу сәтсіз"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2742,78 +2746,73 @@ msgstr ""
 "\"%(arg)s\" аргументі көрсетілмеген. \n"
 "Көбірек білу үшін \"%(basename)s help %(command)s\" енгізіңіз"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s бума екен, алайда файл болуы керек еді"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Өшірілуде %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Белгісіз SSL қатесі: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Жаңа жеке хабарлама"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "%(nickname)s жіберген жаңа хабарлама"
 msgstr[1] "%(nickname)s жіберген жаңа хабарлама"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Жаңа чат бөлмесі"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s күйін өзгерткен"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s қазір %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Контакт қалып-күйін өзгертті"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s желіге кірді"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Контакт кірді"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s желіден шықты"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Контакт шықты"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "\"%s\" үішн аутентификация сәтсіз"
@@ -2887,64 +2886,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Жаңа кір_гендер туралы хабарлау"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Жаңа _шыққандар туралы хабарлау"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Жаңа хабарламаларды қалқымалы терезеде көрсету керек пе?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Жаңа кірген контакт аты үшін фон түсі."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Жиналған жолдар (тіркелгілер мен топтар) тізімі (бос аралықпен ажыратылсын)."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "бастапқысы"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Емле тексеруші қолданатын тілі"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2954,15 +2911,15 @@ msgstr ""
 "'sometimes' - уақытты әр print_ichat_every_foo_minutes минут сайын көрсету.\n"
 "'never' - уақытты ешқашан көрсетпеу."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "* / _ жұптарын мүмкін пішімдеу таңбалары ретінде қарастыру."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2971,7 +2928,7 @@ msgstr ""
 "Белсенді болса, */_ өшірілмейді. Мысалы, *abc* жуан қаріппен көрсетіледі, "
 "бірақ * * өшірілмейді."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2980,7 +2937,7 @@ msgstr ""
 "Топтық чатта ник аттарын автотолықтыру (tab пернесі) қолдану кезінде ник "
 "атының артына қосылатын таңба."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2989,17 +2946,17 @@ msgstr ""
 "Таңдалған ник атын чатта біреу қолданып тұрса, ол ник аты артына қосуға "
 "ұсынылатын таңба."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3012,23 +2969,23 @@ msgstr ""
 "білу үшін python құжаттамасынан strftime үшін ақпаратты қараңыз: http://docs."
 "python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Сөйлесулерде ник атына дейін қойылатын таңбалар"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Сөйлесулерде ник атынан кейін қойылатын таңбалар"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Белгіленген болса, Gajim ростердегі контакттар үшін көңіл-күйін көрсетеді"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3037,12 +2994,12 @@ msgstr ""
 "Чат беті/терезесі қайта ашылған кезде алдыңғы сөйлесуден қанша тарих жолын "
 "есте сақтау керек."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3051,19 +3008,19 @@ msgstr ""
 "Конференциядан шыққан кезде қанша минуттан кейін оған авто түрде кіру "
 "талабын жасау. Өздігінен кіруді сөндіру үшін 0-ге орнатыңыз."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Хабарламаларды Ctrl+Enter басқанда жіберу, ал Enter жаңа жолға өтеді "
 "(Mirabilis ICQ клиенті сияқты)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Ctrl+KeyUP үшін қанша тарих жолын сақтау керек."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3072,11 +3029,11 @@ msgstr ""
 "%s бар таңдауыңызша сілтеме, бұл жерде %s - сөз не мәтін, немесе "
 "'WIKTIONARY', яғни, wiktionary қолдану."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Белгіленсе, Gajim-ді қашықтан gajim-remote қолданып басқаруға болады."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3085,15 +3042,15 @@ msgstr ""
 "Әр хабарлама үшін уақытты көрсетпеу кезде (print_time==sometimes), оны әр x "
 "минут сайын көрсету."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Топ чат беті/терезесін жабу алдында сұрау."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3102,7 +3059,7 @@ msgstr ""
 "Беттері бар терезені жабу алдында сұрау, егер ақпаратты жоғалту мүмкіндігі "
 "болса (чат, жеке чат, қайырылмайтын топтық чат)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3111,31 +3068,31 @@ msgstr ""
 "Жергілікті интерфейстерге қоса, үтірмен ажыратылған хост аттары, адрес/"
 "порттар бағдарлауы кезінде Файлдармен алмасу үшін оларды жібереміз."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандарты КиБ = 1024 байт, ал КБ = 1000 байтқа тең деп айтады."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Оқиғалар жөнінде жүйелік сөреде хабарлау."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Тек бір сөйлесу бар болса чат терезесінде беттерді көрсету керек пе?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Чат терезесінде бет шекарасын көрсету керек пе?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Бет үшін жабу батырмасын көрсету керек пе?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Жаңа хабарламаларды қалқымалы терезеде көрсету керек пе?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3144,7 +3101,7 @@ msgstr ""
 "Топтық чаттарда түспен ерекшелеу үшін сөздер тізімі, нүктелі үтірмен "
 "ажыратылсын."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3154,22 +3111,13 @@ msgstr ""
 "Белсенді болса, Терезелер басқарушысы ұсынған X батырмасын шерткенде Gajim "
 "жұмысын өз аяқтайды. Тек жүйелік сөре таңбашасы іске қосулы болу керек."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Белгіленген болса, Gajim оқылмаған хабарламалар бар әр бетте таңбашаны "
-"көрсетеді. Темаға байланысты, таңбашаның анимациясы болуы мүмкін."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3178,13 +3126,13 @@ msgstr ""
 "Белгіленген болса, Gajim ростерде әр контакт астында оның қалып-күй "
 "хабарламасын көрсетеді, егер ол бар болса."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Ростердегі аватар орналасуын орнатады. left не right бола алады"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3193,26 +3141,26 @@ msgstr ""
 "Сөндірілген болса, Gajim чаттарда контакт өз күйін не күй хабарламасын "
 "өзгертсе, күй жолын енді жазбайды."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Ростерді жүйелік есептер панелінде көрсетпеу."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3221,7 +3169,7 @@ msgstr ""
 "Белсенді болса және GTK+ мен PyGTK нұсқалары кем дегенде 2.8 болса, кезекте "
 "оқиға бар болса, терезе шегі жыпылықтайды."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3242,7 +3190,7 @@ msgstr ""
 "'pertype' - Хабарламалар түрі бойынша (мыс. чат не топтық чаттар) терезеге "
 "жіберіледі."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3250,32 +3198,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Сөндірілеген болса, сіз чат терезесінде аватарды көрмейтін боласыз."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Белсенді болса, escape батырмасы бет/терезені жабады"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Топтық чат терезесінде тақырыпты жасырады"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Топтық чат терезесінде тақырыпты жасырады"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Топтық чат терезесінде мүшелер тізімін жасырады"
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3284,11 +3232,11 @@ msgstr ""
 "Чатта, алдыңғы хабарламадағы адам емес болмаса ғана, жол басынан контакт "
 "атын көрсету."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Біріккен тізбекті ник атын қолдану кезіндегі шегіну."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3296,7 +3244,7 @@ msgid ""
 msgstr ""
 "Оқылмағандар болмаса, Ctrl-Tab басу арқылы келесі жазылудағы бетке өтеді."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3305,7 +3253,7 @@ msgstr ""
 "Контактты блоктауды растау сұхбатын көрсету керек пе? Бос жол терезені "
 "ешқашан көрсетпеуді белгілейді."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3314,7 +3262,7 @@ msgstr ""
 "Контактты блоктауды растау сұхбатын көрсету керек пе? Бос жол терезені "
 "ешқашан көрсетпеуді белгілейді."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3325,7 +3273,7 @@ msgstr ""
 "орната аласыз. АБАЙЛАҢЫЗ, теріс приоритетпен отырған кезде, серверден бірде-"
 "бір хабарламаны АЛМАЙСЫЗ."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3334,7 +3282,7 @@ msgstr ""
 "Қосулы тұрса, Gajim желідегі мен барлық контакттар санын тіркелгі мен топтар "
 "жолында көрсетеді."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3343,23 +3291,19 @@ msgstr ""
 "Қосулы болса, Gajim сізге соңғы болып хабарламаны жіберген контактты "
 "белгілейді, егер чат терезесі ашылған болмаса."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Күйді өзгерту терезесі жабылу үшін керек белсенді еместік уақыт шамасы."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Сөйлесулерде көрсетілетін жолдардың максимал саны. Ескі жолдар өшіріледі."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Белсенді еместігіне екі тексеру арасындағы уақыт."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3368,31 +3312,31 @@ msgstr ""
 "Дұрыс uri схемелары. Тек осы тізімдегі схемалар ғана \"шын\" uri ретінде "
 "қабылданады. (mailto және xmpp бөлек өнделеді)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Қосулы тұрса, топ чаттардағы мәтінді автотолықтыру қоршамдағыдай іске асады"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Осыған қоса, jingle шығыс видеосының кадр/сек қасиетін автоөзгерту. Мысалы: "
 "10/1 не 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Осыған қоса, jingle шығыс видеосының өлшемін автоөзгерту. Мысалы: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3402,12 +3346,12 @@ msgstr ""
 "Ол сервер \"stun_server\" опциясында көрсетіледі не оны jabber сервердің өзі "
 "береді."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "STUN сервері, jingle қолдану үшін"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3416,23 +3360,23 @@ msgstr ""
 "Қосулы тұрса, топ чаттарындағы қатысушылардың қатысу деңгейін көрсету үшін, "
 "Gajim күй таңбашаларына кішкене ғана түсті шаршы қосады"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3441,11 +3385,7 @@ msgstr ""
 "Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері "
 "қолданылады."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3453,37 +3393,37 @@ msgstr ""
 "Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін Gnome Keyring (егер "
 "қолжетерлік болса) қолданады."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3492,7 +3432,7 @@ msgstr ""
 "Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
 "рұқсат етеді"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3501,7 +3441,7 @@ msgstr ""
 "Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
 "рұқсат етеді"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3510,7 +3450,7 @@ msgstr ""
 "Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
 "рұқсат етеді"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3519,7 +3459,7 @@ msgstr ""
 "Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
 "composing_only (тек жазу туралы), disabled (сөндірілген)."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3528,28 +3468,32 @@ msgstr ""
 "Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
 "composing_only (тек жазу туралы), disabled (сөндірілген)."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_Бөлмені бетбелгілерге қосу"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3558,7 +3502,7 @@ msgstr ""
 "Приоритет күйіңізге сәйкес автоөзгертіледі. Приоритеттер autopriority_* "
 "опцияларында бапталған."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3570,18 +3514,18 @@ msgstr ""
 "ЕСКЕРТУ: бұл опция тек restore_last_status опциясы сөндірілген болса ғана "
 "қолданылады"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Қосулы тұрса, соңғы қалып-күй қалпына келтіріледі."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr "Белсенді болса, жазылуды сұраған контакттар авто қабылданады."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3590,12 +3534,12 @@ msgstr ""
 "Сөндірілген болса, бұл тіркелгі сөндіріледі және ростерде көрсетілмейтін "
 "болады."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Сервермен байланысты орнатқан жоқсыз"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3604,22 +3548,22 @@ msgstr ""
 "Парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын "
 "көрсету."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3628,7 +3572,7 @@ msgstr ""
 "Байланысты қайта орнатпас бұрын, ping alive дестесіне жауапты қанша секунд "
 "күту керек."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3637,35 +3581,35 @@ msgstr ""
 "Белгіленген болса, Gajim файлдармен алмасулар үшін сіздің IP бен "
 "file_transfer_proxies опциясындағы прокси адрестерін қолданады."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері "
 "қолданылады."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Gajim-ге сіздің операциялық жүйеңіз туралы ақпаратты жіберуге рұқсат ету."
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim-ге сіздің жергілікті уақытты жіберуге рұқсат ету."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Қосқыңыз келетін контакттарға жіберілетін хабарлама"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3674,28 +3618,24 @@ msgstr ""
 "Белгіленген болса, Gajim файлдармен алмасулар үшін сіздің IP бен "
 "file_transfer_proxies опциясындағы прокси адрестерін қолданады."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "SSL сертификат қатесі"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3704,41 +3644,41 @@ msgstr ""
 "Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
 "composing_only (тек жазу туралы), disabled (сөндірілген)."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Бұл тіркелгі үшін ESessions шифрлеуді іске қосу."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3747,7 +3687,7 @@ msgstr ""
 "Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
 "composing_only (тек жазу туралы), disabled (сөндірілген)."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3758,84 +3698,84 @@ msgstr ""
 "Gajim жұмыс аяқтағанда сақталады). Бұл опция плагиндерді белсенді(емес) қылу "
 "үшін ҚОЛДАНБАҢЫЗ. Орнына GUI қолданыңыз."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Ұйқыда"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Жақында ораламын"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Бірнеше минутта ораламын."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Тамақ ішуде"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Мен жұмыс істеп отырмын."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Кино"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Кино көрудемін."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Жұмыс істеудемін"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Мен жұмыс істеп отырмын."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Мен телефонмен сөйлесудемін."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Жоқ"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Мен өмірмен рахаттанып отырмын."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Мен бармын."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Мен чат үшін дайынмын."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Жақында боламын."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Мен жоқпын."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Мазамды алмаңыз."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Қош!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3844,1065 +3784,1065 @@ msgstr ""
 "Топ чат хабарламасында muc_highlight_words ішінде көрсетілген сөздердің "
 "біреуі не сіздің ник атыңыз кездескен кезде ойналатын дыбыс."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "MUC хабарламасы келген кезде ойналатын дыбыс."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Оған"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Қате: оқу үшін %s ашу мүмкін емес"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Топтық чаттар"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Сізді біреу бөлмеде еске алған"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Топ чатына шақыру"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Топ чатына шақыру"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Чат бөлмесі"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Топтық чаттар"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Топтық чаттарды жасау рұқсат етілмеген."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Жаңа чат бөлмесі"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Қызмет табылмады"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Бұл топтық чат"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Local тіркелгісі бар болыр тұр."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "%s топтық чаты жоқ."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Чат бөлмелер тарихы"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Күнделікті істер"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Тамақты сатып алуда"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Тазалау"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Тамақ жасауда"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Қызмет көрсетуде"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Ыдыс жууда"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Кір жууда"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Бақшамен айналысуда"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Іссапарда"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Итті қыдыртуда"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Ішуде"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Сыра ішуде"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Кофе ішуде"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Шай ішуде"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Жеңіл тамақтану"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Таңертеңгі тамақ"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Түскі тамақ"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Ланч"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Шынығу"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Велосипед"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Билеуде"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Жаяу жүру"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Жайлап жүгіру"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Спортпен шұғылдануда"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Жүгіруде"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Шаңғы тебу"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Шомылуда"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Бапталу"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Өз-өзін күту"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "Спа ішінде"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Тіс жууда"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Шаштаразда"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Қырынуда"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Ваннада"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Душта"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Кездесу"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Белсенді емес"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Бос күн"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Қыдыруда"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Жасырылуда"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Демалыста"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Сиыну"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Жоспарланған мейрам"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Ойлауда"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Демалу"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Балық аулауда"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Ойнауда"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Қыдыруда"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Мереке"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Оқуда"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Репитиция"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Дүкенде"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Темекі атуда"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Адамдармен араласу"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Күнге күю"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "ТВ көруде"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Кино көрудемін."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Сөйлеуде"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "Шын өмірде"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Телефонмен сөйлесуде"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Видеофонда"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Саяхатта"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Қалыпты сапарда"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Жүргізуде"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "Машинада"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "Автобуста"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "Ұшақта"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Пойызда"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Жол үстінде"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Қыдыруда"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Код жазуда"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "Кездесуде"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Оқуда"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Жазуда"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Қорқуда"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Таң қалған"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Ғашық"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Ашулы"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Тітіркенген"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Алаңдаған"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Қоздырылған"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Ұялған"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Жалыққан"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Қайсар"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Тыныш"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Абайлаған"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Суық"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Сенімді"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Шатасқан"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Маңырайған"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Мәз"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Қырсық"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Жынды"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Жасампаз"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Әуесқой"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Қапа болған"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Депрессияда"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Түңілген"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Жиіркенген"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Елегізген"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Шашыраңқы"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Қымсынған"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Қызғанған"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Қызыққан"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Әсемпаз"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Көңілі қайтқан"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Разы"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Мұң"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Ашулы"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Кінәлі"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Бақытты"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Сенімді"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Ыстық"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Кемсітілген"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Қор болған"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Аш"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Жаралы"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Әсер етілген"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Қастерлеуде"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Ғашық"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Ашынған"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Қызыққан"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Мас"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Жеңілмейтін"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Қызғаншақ"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Жалғыз"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Жоғалған"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Сәтті"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Орташа"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Түнерген"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Ашушаң"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Бейтарап"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Ренжіген"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Қорланған"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Ойнақы"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Мақтанған"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Босаң"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Босатылған"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Өкінген"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Тынымсыз"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Көңілі жоқ"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Мысқыл"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Қанағат"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Байсалды"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Шокта"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Ұялшақ"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Ауырған"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Ұйқылы"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Спонтанды"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Қызулы"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Күшті"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Таң қалған"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Сыйлаушы"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Сусаған"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Шаршаған"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Тағайындалмаған"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Әлсіз"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Абыржыған"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "бастапқысы"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Жасырылуда"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Тіркелгі"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Тіркелгі бағаны"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Сипаттамасы"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Қате"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "бір"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "бөлме"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 #, fuzzy
 msgid "street"
 msgstr "stream"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Шығарушы сертификатын алу мүмкін емес"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Сертификат үшін CRL алу мүмкін емес"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Сертификат қолтаңбасын декодалау мүмкін емес"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "CRL қолтаңбасын декодалау мүмкін емес"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Шығарушының ортақ кілтін декодалау мүмкін емес"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Сертификат қолтаңба қатесі"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "CRL қолтаңба қатесі"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Сертификат мерзімі әлі басталмаған"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Сертификат мерзімі біткен"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL мерзімі әлі басталмаған"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL мерзімі біткен"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Сертификаттың notBefore өрісіндегі пішім қатесі"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Сертификаттың notAfter өрісіндегі пішім қатесі"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "CRL lastUpdate өрісіндегі пішім қатесі"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "CRL nextUpdate өрісіндегі пішім қатесі"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Жады жеткіліксіз"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Өздігінен қолтаңбасы бар сертификат"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Сертификаттар тобындағы өздігінен қолтаңбасы бар сертификат"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Жергілікті шығарушы сертификатын алу мүмкін емес"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Бірінші сертификатты тексеру мүмкін емес"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Сертификаттар тізімі тым үлкен"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Сертификат қайта шақырылған"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "CA қате сертификаты"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Жол ұзындық шектеуі асырылған"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Қолдау жоқ сертификат мақсаты"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Сертификатқа сенім жоқ"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Сертификат тайдырылған"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Сертификатты ұсынушының сәйкес еместігі"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 "Сертификаттау орталығы мен иесі кілттерінің идентификаторлары өзара сәйкес "
 "емес"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 "Сертификаттау орталығы мен ұсынушы кілттерінің идентификаторлары өзара "
 "сәйкес емес"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Кілтті қолдану сертификаттарға қолтаңбаны қою қамтымайды"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Қолданбаны растау қатесі"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Сертификат қайта шақырылған"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Белгісіз SSL қатесі: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Сертификат мерзімі біткен"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Авторизация қабылданды"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Тіркелгі сөндірулі"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Сертификат мерзімі біткен"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Жазылуға сұраным"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Кеңейтуге қолдау жоқ"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "\"%s\" үішн аутентификация сәтсіз"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4964,12 +4904,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s баптау қатесі"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4988,295 +4928,251 @@ msgstr ""
 "Қатесі:\n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "аудио кірісі"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "аудио шығысы"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "видео кірісі"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Хост атындағы қате таңба."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Сервер адресі керек."
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Пайдаланушы аты 1 мен 1023 таңба арасында болуы керек"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Пайдаланушы атындағы қате таңба."
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Ресурс атындағы қате таңба."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Бос емес"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Бос емес"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "Қо_л жетерсіз"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Қол жетерсіз"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Чатқа дайын"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Чатқа дайын"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "?user status:_Осында"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "?user status:Осында"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Байланыс орнату"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "К_етіп қалған"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Кетіп қалған"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "Желі_де емес"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Желіде емес"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?контакт күйі:Белгісіз"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?контакт күйі:Қателері бар"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Жоқ"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Оған"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Одан"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Екеуі де"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?ОЖ:Белгісіз"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Жоқ"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Жазылу"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Модераторлар"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Қатысушылар"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Қатысушы"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Қонақтар"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Қонақ"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Жоқ"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Иесі"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Иесі"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Әкімші"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Әкімші"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Мүше"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Мүше"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "хабарламаға көңіл аударды"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "басқа нәрсемен айналысуда"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "хабарлама жазып тұр..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "хабарлама жазуды аялдатқан"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "чат терезесін не бетін жапты"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d хабарлама бар"
 msgstr[1] "%d хабарлама бар"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "_чат бөлмелерінде"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " %s пайдаланушысынан"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr ", қайдан: %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d оқиға бар"
 msgstr[1] "%d оқиға бар"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Мен сізді өзімнің контакттар тізіміне қосқым келеді."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Сәлем, мен - $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Суретті жүктеу уақыты бітті"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Сурет тым үлкен"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL мерзімі әлі басталмаған"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Суретті жүктеу уақыты бітті"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s файл екен, алайда бума болуы тиіс еді"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim қазір өз жұмысын аяқтайды"
 
@@ -5379,83 +5275,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Мен өз ростеріме сізді қосқым келеді"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Файл бос"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Файл жоқ"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E шифрлену сөндірулі"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Қалып-күй ақпаратын өзгерту"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Қалып-күйді өзгерту"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Бар болудың түрін мен анықтамасын орнату"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Чатқа дайын"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Осында"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Кеңейтілген кетіп қалған"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Мазамды алмаңыз"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Желіде емес - байланыспаған"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Бар болудың анықтамасы:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Қалып-күй өзгертілді."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Жіберген контакт: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Жіберілген контакттар:"
 
@@ -5478,7 +5374,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Тіркелгі"
 
@@ -5489,7 +5385,7 @@ msgstr "Топтық чаттар"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -5513,7 +5409,7 @@ msgstr "_чат бөлмелерінде"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Кіру"
@@ -5531,17 +5427,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Бас тарту"
 
@@ -5690,7 +5586,7 @@ msgstr "Контакт ақпараты"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Сипаттамасы"
 
@@ -5895,40 +5791,45 @@ msgstr "Жұмыс"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Өзім туралы"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Бөлмеге кіру"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Жақында ораламын"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Кіру"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "%s тіркелгісі өшірілуде"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "Тазалау"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5999,6 +5900,7 @@ msgid "Strike"
 msgstr "Сызылған"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Түс"
 
@@ -6011,137 +5913,134 @@ msgstr "Қаріп"
 msgid "Clear formatting"
 msgstr "Пішімдеуді тазарту"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Клиент сертификатын таңдау"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Смайликтер тізімін көрсету (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Блоктау..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "%s контакты үшін жаңа ник атын енгізіңіз"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "_Никті өзгерту..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "_Тақырыпты өзгерту..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Жаңа парольді енгізіңіз:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Топ чаттардан шығу"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Белгіленген болса, Gajim қосылғанда бұл чат бөлмесіне автоматты түрде кіреді"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Қате орын алды:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Қайтадан растау..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Қатысушы"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Тебу"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Басқа кездесу орнын көрсете аласыз:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Қатысушы"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Бан"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Жаңа чат бөлмесі"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Өшірілуде %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Басқа кездесу орнын көрсете аласыз:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Себебі"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "%s тобы үшін жаңа атын енгізіңіз"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "_Шақыру"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Оқиға түрі"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Оқиға анықтамасы"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6237,20 +6136,20 @@ msgid "Add"
 msgstr "Қосу"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "Өші_ру"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс: "
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Күй"
 
@@ -6260,7 +6159,7 @@ msgid "Client"
 msgstr "<b>Клиент:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Жүйе:</b>"
@@ -6403,38 +6302,39 @@ msgstr "Т_ерезе түрі:"
 msgid "_Show contact list on startup"
 msgstr "Gajim қосылғанда, байланыс _орнату"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Тіркел_гілерді біріктіру"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Ростердегі контакттардың а_ватарларын көрсету"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6443,12 +6343,12 @@ msgstr ""
 "Белгіленген болса, Gajim ростердегі мен топ чаттағы контакттар үшін "
 "аватарларын көрсетеді"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Ростердегі _контакттардың қалып-күй хабарламаларын көрсету"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6457,53 +6357,53 @@ msgstr ""
 "Белгіленген болса, Gajim ростердегі мен топ чаттағы контакттар үшін қалып-"
 "күй хабарламаларын көрсетеді"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Ростерде_гі контакттардың орналасуын көрсету"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Контакттарды қалып-күй бойынша сұрыптау"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Жіберілген контакттар:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "_чат бөлмелерінде"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Ростер элементтерімен алмасу"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Емлені тексеру"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6515,29 +6415,29 @@ msgstr ""
 "қателерін түспен ерекшелейді. Егер өрісте оң жақ шерту арқылы тіл ерекше "
 "көрсетілмесе, сол контакт не топ чаты үшін бастапқы тіл қолданылады."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "хабарлама құрамасы"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Пішімдеулер тізімін көрсету"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Ростердегі _контакттардың қалып-күй хабарламаларын көрсету"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6546,58 +6446,58 @@ msgstr ""
 "Сөндірілген болса, Gajim чаттарда контакт өз күйін не күй хабарламасын "
 "өзгертсе, күй жолын енді жазбайды."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Плагиндер"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Бет үшін жабу батырмасын көрсету керек пе?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6606,112 +6506,115 @@ msgstr ""
 "Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
 "рұқсат етеді"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Бет үшін жабу батырмасын көрсету керек пе?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
+"рұқсат етеді"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Соңғы қалып-күйі: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Чаттар"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Жүйелік сөре таңбашасын көрсету:"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Жаңа оқиға кезінде:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Қалқыма/хабарлауды мен _кқ/қж/бе/жасырын болғанда рұқсат ету"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "Қалқыма/хабарлауды мен _кқ/қж/бе/жасырын болғанда рұқсат ету"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Жаңа кір_гендер туралы хабарлау"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Жаңа _шыққандар туралы хабарлау"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Хабарламалар</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Дыбы_старды ойнату"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Б_асқару..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Мен бос емес _болғанда дыбыстарға рұқсат ету"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav дыбыстары"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Хабарламалар"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Қол жетерсіз"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6720,7 +6623,7 @@ msgstr ""
 "Белгіленген болса, Gajim компьютеріңіз одан да көп қолданылмаса, қалып-"
 "күйіңізді Қолжетерсізге ауыстырады."
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6729,7 +6632,7 @@ msgstr ""
 "Белгіленген болса, Gajim компьютеріңіз одан да көп қолданылмаса, қалып-"
 "күйіңізді Қолжетерсізге ауыстырады."
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6742,7 +6645,7 @@ msgstr ""
 "$S алдыңғы күй хабарласымен, ал\n"
 "$T авто кетіп қалған уақыт шамасымен алмастырылады"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6755,40 +6658,40 @@ msgstr ""
 "$S алдыңғы күй хабарласымен, ал\n"
 "$T авто қолжетерсіз уақыт шамасымен алмастырылады"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "минуттан кейін"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Өздігінен қалып-күйді орнату"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Күй хабарламасын сұрау:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Мен _кірген"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Мен _шыққан кезде"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6796,68 +6699,68 @@ msgstr ""
 "Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері "
 "қолданылады."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Хабарлама"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Қосулы"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Күй хабарламасы"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Алдын-ала орнатылған қалып-күй хабарламалары</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Тақырыбы"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Тақырыбы"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Интерфейстің түстерін мен қарібін баптау"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Кү_й таңбашалары:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "_Транспорт таңбашаларын қолдану"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6867,74 +6770,74 @@ msgstr ""
 "(Мыс. Mail.ru пайдаланушылары үшін сәйкес Mail.ru Agent таңбашалары "
 "көрсетіледі)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Стиль"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Мүміндіктері"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Аудио шығару құрылғысы"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Аудио енгізу құрылғысы"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Аудио сынау"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Видео сынау"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Видео енгізу құрылғысы"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "видео шығысы"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Видеоның кадр/сек қасиеті"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Видео өлшемі"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Байланыс"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "STUN сервері:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -6943,51 +6846,61 @@ msgstr ""
 "STUN серверінің хост аты. Көрсетілмеген болса, Gajim серверден\n"
 "оны іздеп көреді."
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Аудио / Видео"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Басқару..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Белгіленген болса, Gajim бұл тіркелгі үшін парольді сақтап отырады"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Таңдамалы</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "А_шу..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Кеңейтілген баптаулар түзетушісі"
@@ -7170,12 +7083,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Жаңа парольді енгізіңіз:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Кеңейтілген әрекеттер"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Пайдаланушы хост аты/порт қолдану"
@@ -7261,7 +7174,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Мен _кірген"
@@ -7275,7 +7188,7 @@ msgstr "Өзіңіз таңдаған аты бар жаңа теманы жас
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7304,8 +7217,8 @@ msgstr "Бас_тапқы түстерге тастау"
 msgid "Resets value to default"
 msgstr "Бас_тапқы түстерге тастау"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост аты:"
@@ -7348,7 +7261,7 @@ msgstr "Клиент сертификаты"
 msgid "Proxy Host"
 msgstr "Прокси _хосты:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Түрі"
 
@@ -7362,8 +7275,7 @@ msgstr "_Хаттама:"
 msgid "Copy info to clipboard"
 msgstr "_Сілтеме адресін көшіру"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Мүміндіктері"
 
@@ -7549,6 +7461,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Көңіл-күй:</b>"
@@ -7625,9 +7542,10 @@ msgid "Installed"
 msgstr "Орнатылған"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "Плагин анықтамасы осында болу керек. PluginsWindow іске қосылған кезде бұл "
 "мәтін өшірілетін болады."
@@ -7815,80 +7733,106 @@ msgstr "Плагиндер"
 msgid "_Name"
 msgstr "_Аты:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Прокси:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Чатты бастау"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Топ чаттардан шығу"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Тарихты басқару"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Плагиндер"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Баптаулар"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Шығу"
+msgid "_Accounts"
+msgstr "Тіркелгілер"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Түрі"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Те_к белсенді контакттарды көрсету"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Желіде _еместерді көрсету"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Те_к белсенді контакттарды көрсету"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Транс_порттарды көрсету"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML консолі"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Файлдармен алмасу"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Көмек"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Осында"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Осында"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Мүміндіктері"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Өзім туралы"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7903,6 +7847,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Топ чаттардан шығу"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8191,60 +8140,68 @@ msgstr "Ростер элементтерімен алмасу"
 msgid "Create new group chat"
 msgstr "Топ чаттардан шығу"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Баптаулар"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Плагиндер"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Файлдармен алмасу"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "қалып-күй хабарламасы"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "XML _консолін көрсету"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Чаттың сыртқы түрі</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Желіде _еместерді көрсету"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Те_к белсенді контакттарды көрсету"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Те_к белсенді контакттарды көрсету"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Контакттар"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Контакт ақпараты"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Жіберілген контакттар:"
@@ -8320,12 +8277,16 @@ msgstr "Форманы толтырыңыз."
 msgid "Group Chat Configuration"
 msgstr "Топ чатына шақыру"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML консолі"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Чатты бастау..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Фильтр:"
@@ -8371,11 +8332,6 @@ msgstr "Қат_ыспаған оқиғаларды көрсету"
 msgid "Mute Sounds"
 msgstr "Дыбыстарды сөндіру"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Баптаулар"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8692,124 +8648,124 @@ msgstr "%(name)s жіберген %(filename)s файлын алу тоқтат�
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s чат бөлмесіне кірді"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Сізді біреу бөлмеде еске алған"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Топтық чаттар"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Сізді біреу бөлмеде еске алған"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Топтық чаттар"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Сізді біреу бөлмеде еске алған"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Қызмет табылмады"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Топтық чаттар"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Топтық чаттар"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Топтық чаттар"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Топ чатына шақыру"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Бұл сессия серверде САҚТАЛАДЫ"
@@ -8838,7 +8794,7 @@ msgid "Sender: %s"
 msgstr "Жіберуші: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Алушы: "
 
@@ -8990,7 +8946,7 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Бос файлдарды жіберу мүмкін емес"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Жіберуші: "
 
@@ -9005,7 +8961,7 @@ msgid "Change"
 msgstr "_Никті өзгерту..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Жақында ораламын"
@@ -9036,11 +8992,12 @@ msgid "Password Change Failed"
 msgstr "Пароль керек"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Жасау кезінде қате кетті"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Парольді өзгерту"
 
@@ -9078,40 +9035,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Белгісіз SSL қатесі: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Жалғастырылған сөйлесу"
+msgid "Start / Join Chat"
+msgstr "Чатты бастау"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Байланыс орнатпасаңыз, топтық чатқа кіре алмайсыз."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Бөлмеге кіру"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Контакт қосу..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s табылмады"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Бұл қызмет әлі толық ақпаратпен жауап бермеген"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9120,33 +9072,33 @@ msgstr ""
 "Бұл қызмет толық ақпаратпен жауап бере алмайды.\n"
 "Ол ескірген не сынық сияқты"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Басқалар"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Топтық чаттар"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Байланысты орнатпасаңыз, қолжетерлік қызметтерді қарай алмайсыз"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "%s тіркелгісі үшін қызметтерді қарап шығу"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Қызметтерді қарап шығу"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Қызмет табылмады"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9154,142 +9106,142 @@ msgstr ""
 "Сіз енгізген адресі бойынша қызметтер жоқ, не олар жауап бермейді. Адресті "
 "тексеріп, қайталап көріңіз."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Қызмет қарау үшін қол жетерсіз"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Қызметтің осы түрінде қарауға болатын ешнәрсе жоқ."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Сервердің аты қате"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "%(address)s қарау, %(account)s тіркелгісі"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "Қара_п шығу"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Бұл қызметте қарап шығуға болатын ешнәрсе жоқ."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Пәрмендер"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "_Тіркелу"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "І_здеу"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "Тү_зету"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Қаралуда %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Пайдаланушылар"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Жазылған"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Node"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Жаңа хабарлама"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "Жаз_ылу"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "Жа_зылудан бас тарту"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Бір хабарламаны жіберу..."
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "тақырып"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "%s тіркелгісін қолданып, дара хабарлама"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "%s тіркелгісінде дара хабарлама"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Дара хабарлама"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Жіберу %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Алынған %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Таңба рұқсат етілмеген"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Байланыс қолжетерсіз"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" үшін байланыс орнатылғанына көз жеткізіңіз."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "%s үшін хабарламаны жіберу мүмкін емес, бұл JID дұрыс емес."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s жазған:\n"
@@ -9335,94 +9287,76 @@ msgstr "Тіркелу сәтті аяқталды"
 msgid "Registration failed"
 msgstr "Тіркелу сәтсіз"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "%s тілі үшін сөздік қолжетерсіз"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Емлені тексеру үшін сізге %s сөздігін орнату керек, не speller_language "
-"опциясы көмегімен басқа тілді таңдаңыз.\n"
-"\n"
-"Қате жазылған сөздерді түспен ерекшелеу мүмкіндігі енді қолданылмайды"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "%s тіркелгісі үшін"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG нөмірі:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "expire"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Топ чатына шақыру"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact сізді %(room_jid)s топ чатына қатысуға шақырған"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Түсіндірме: %s"
@@ -9437,6 +9371,11 @@ msgstr "GG нөмірі:"
 msgid "ICQ Number"
 msgstr "ICQ нөмірі:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Контакт қосу..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9492,7 +9431,7 @@ msgstr "Қызметті қосу қатесі. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9654,31 +9593,51 @@ msgstr "Контакт байланыспаған"
 msgid "Contact Connected Background "
 msgstr "Контакт байланысқан"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Күй хабарламасы"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Күй хабарламасы"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Күй хабарламасы"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Күй хабарламасы"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Ник аты қате"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Таңба рұқсат етілмеген"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Ерекшеленген хабарламаны өшіруді шынымен қалайсыз ба?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9686,12 +9645,12 @@ msgid ""
 msgstr ""
 "Бұл атау қолдануда. Бұл қалып-күй хабарламасын алмастыруды қалайсыз ба?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Белсенді"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Плагиндер"
@@ -9715,10 +9674,9 @@ msgid "Error: %s"
 msgstr "Қате: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Қате"
 
@@ -9732,48 +9690,48 @@ msgstr "Қазір қалып-күйі: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Қазір қалып-күйі: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Жаңа E-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Барлық файлдар"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Тазалау"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Прокси профайлдарын басқару"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Прокси:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "Күйге сә_йкес"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Желіде емес"
@@ -9794,7 +9752,7 @@ msgstr "Тіркелгі бағаны"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Сіздің жаңа тіркелгіңіз сәтті жасалды"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9826,60 +9784,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "\"%s\" тіркелгісі серверге қосылған"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Синхрондау"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Сіздің не істегіңіз келеді?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Байланыс орнату"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Оқылмаған хабарламаларды бағдарлау"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber қолданбасы"
@@ -9936,126 +9899,126 @@ msgstr "Сыйлаушы"
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2009-2010"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Жіберу үшін файлды таңдаңыз..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Архивті таңдаңыз"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Барлық файлдар"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Барлық файлдар"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "_Файлды жіберу"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Суреттер"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Архивті таңдаңыз"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Zip файлдары"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Файлды қалайша сақтау..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s осы чат бөлмесінде"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Байланысқан"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Байланыспаған"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Файл аты: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Беру"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Тарату"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Файлдармен алмасу тоқтатылды"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:Аялдатылған"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:Аялдатылған"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Анықтамасы: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:Аялдатылған"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:Аялдатылған"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Аялдатылған"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:Аялдатылған"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:Аялдатылған"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Аялдатылған"
@@ -10064,7 +10027,7 @@ msgstr "?transfer status:Аялдатылған"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Қате файл"
@@ -10120,25 +10083,25 @@ msgstr "Сізді біреу бөлмеде еске алған"
 msgid "Group Chat Message Received"
 msgstr "Бөлмеде хабарлама алынды"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "require"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Иә"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "Жоқ"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Бас тарту"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10157,11 +10120,6 @@ msgstr "%s тіркелгісін қолданып"
 msgid "Hide _Contact List"
 msgstr "Контакттарды _шақыру"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Те_к белсенді контакттарды көрсету"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Бұл мәзірді жасыру"
@@ -10209,36 +10167,31 @@ msgstr ""
 "Сіз өзіңіздің жеке ақпаратыңызды жариялау кезінде қате кетті, кейін қайталап "
 "көріңіз."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s үшін архивтеу баптаулары"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Архивтеу ба_птауларын түзету"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "%s үшін архивтеу баптаулары"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Сервермен байланысты орнатқан жоқсыз"
+msgid "Archiving Preferences Error"
+msgstr "Архивтеу ба_птауларын түзету"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Алынған ақпарат формасындағы қате"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "Архивтеу ба_птауларын түзету"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Белсенді"
@@ -10287,60 +10240,60 @@ msgstr "?Ask (for Subscription):Жоқ"
 msgid "?password:Hidden"
 msgstr "Пароль:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "Архивтеу ба_птауларын түзету"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Аудио / Видео"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Аудио мен видео чаттарды іске асыру мүмкіндігі."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Бұл мүмкіндік Windows-та қолжетерсіз."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10348,21 +10301,21 @@ msgid ""
 msgstr ""
 "Қалып-күйді өзгерту үшін белсенді емес уақыт шамасын анықтау мүмкіндігі."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "libxss жинағын талап етеді."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10371,101 +10324,101 @@ msgstr ""
 "Жергілікті желіден клиенттерді авто анықтап, серверсіз-ақ хабарламалармен "
 "алмасу."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Талап етеді: python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Талап етеді: gpg мен python-GnuPGInterface."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Байланыс"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Талап етеді: libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Бұл мүмкіндік Windows-та қолжетерсіз."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Хабарламалар"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Аудио мен видео чаттарды іске асыру мүмкіндігі."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "python-dbus талап етеді."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Парольді сақтау"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Парольдерді шифрленген түрде сақтау мүмкіндігі."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Талап етеді: gnome-keyring пен python-gnome2-desktop, не kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Емлені тексеру"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Талап етеді: libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Талап етеді: python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Архивтеу ба_птауларын түзету"
@@ -10511,7 +10464,7 @@ msgstr "Тізім аты қате"
 msgid "You must enter a name to create a privacy list."
 msgstr "Жекелік тізімін жасау үшін оның атын енгізуіңіз керек."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Контакттарды _шақыру"
@@ -10539,7 +10492,7 @@ msgstr "_Аяқтау"
 msgid "Commands"
 msgstr "Пәрмендер"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10612,119 +10565,133 @@ msgstr "%s жіберген жазылуға сұраным"
 msgid "Loading"
 msgstr "Код жазуда"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Байланысқан"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Жасау кезінде қате кетті"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "%s тіркелгісі өшірілуде"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Тіркелгі паролін өзгерту үшін шертіңіз"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Байланыс орнату"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Серверіңіз Vcard-ты қолдамайды"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Таңба рұқсат етілмеген"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Серверіңіз Vcard-ты қолдамайды"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Байланысу сәтсіз"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "\"%s\" тіркелгісі серверге қосылған"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Контакт қосу..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Жаңа хабарламаны жасау"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Таңдауыңызша порт нөмірі түрінде берілуі тиіс."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Кеңейтілген әрекеттер"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "%s банға жіберу"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Белгісіз SSL қатесі: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "%s тіркелгісі өшірілуде"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "%s үшін тіркелу"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Тіркелгі бағаны"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Тіркелгі сәтті қосылды"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Тіркелгілер"
@@ -10767,249 +10734,253 @@ msgstr "Іздеу"
 msgid "No results found"
 msgstr "Нәтижесі жоқ"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Бастапқысы"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "қалып-күй хабарлама атауы"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "қалып-күй хабарлама мәтіні"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Қазір қайта кіру керек пе?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Қазір қайта кіру керек пе?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "Түзетулерді қазір іске асыруды қаласаңыз, қайта кіруіңіз керек."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Avahi не Bonjour орнатулы тұрғанды тексеріңіз."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Avahi не Bonjour орнатулы тұрғанды тексеріңіз."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Қате тіркелгі"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "\"%s\" тіркелгісі серверге қосылған"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Барлық чаттар мен топ чаттары жабылады. Жалғастыруды қалайсыз ба?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Қате тіркелгі"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 #, fuzzy
 msgid "Label"
 msgstr "белгі"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Контакттарды _шақыру"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Клиент сертификаты"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Gajim қосылғанда, байланыс _орнату"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Барлық к_онтакттар үшін хабарламалар тарихын сақтау"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Барлық күйлер"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Тіркелгі не тіркелгілердің қалып-күйін өзгерту"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Файлдармен алмасу үшін прокси қолдану"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "%s бастап белсенді емес"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Gajim-ге сіздің операциялық жүйеңіз туралы ақпаратты жіберуге рұқсат ету."
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Контакттарды _шақыру"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ростердегі емес контакттардан оқиғаларды елемеу"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Приорите_т:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "қор_шамның HTTP__PROXY айнымалысын қолдану"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Тіркелгі не тіркелгілердің қалып-күйін өзгерту"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Аты:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Фамилиясы:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Жаңа E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Күйге сә_йкес"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Қосу"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Байланыс"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Клиент сертификаты"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PKCS12 файлдары"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Парольді сақтау"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Плагиндер"
@@ -11062,19 +11033,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%s контакт өшірілген"
 msgstr[1] "%s контакт өшірілген"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Белгісіз орындаушы"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Белгісіз атауы"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Белгісіз көзі"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11088,20 +11059,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Бетбелгі"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Архив зақымдалған"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "Архив бос"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "Архив қате"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Плагин бар болып тұр"
@@ -11156,127 +11127,249 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Қат_ыспаған оқиғаларды көрсету"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Мүміндіктері"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Жазылған хабарламаларды емлеге тексеру."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "%s тіркелгісі үшін қызметтерді қарап шығу"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Контакттар"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Топтық чаттар"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Соңғылар:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Плагин сәтсіз"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Жалғастырылған сөйлесу"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Белгісіз SSL қатесі: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Белсенді еместігіне екі тексеру арасындағы уақыт."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "%s тілі үшін сөздік қолжетерсіз"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Емлені тексеру үшін сізге %s сөздігін орнату керек, не speller_language "
+#~ "опциясы көмегімен басқа тілді таңдаңыз.\n"
+#~ "\n"
+#~ "Қате жазылған сөздерді түспен ерекшелеу мүмкіндігі енді қолданылмайды"
+
+#~ msgid "_Reconnect"
+#~ msgstr "Қа_йта байланысу"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Шығу"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Те_к белсенді контакттарды көрсету"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Контакт қосу..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Контакттарды _шақыру"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Топ чаттардан шығу"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Жаңа чат бөлмесі"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Белгіленген болса, Gajim оқылмаған хабарламалар бар әр бетте таңбашаны "
+#~ "көрсетеді. Темаға байланысты, таңбашаның анимациясы болуы мүмкін."
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Хост атындағы қате таңба."
+
+#~ msgid "Server address required."
+#~ msgstr "Сервер адресі керек."
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Пайдаланушы аты 1 мен 1023 таңба арасында болуы керек"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Пайдаланушы атындағы қате таңба."
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Ресурс атындағы қате таңба."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Жаңа кір_гендер туралы хабарлау"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Жаңа _шыққандар туралы хабарлау"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Жаңа хабарламаларды қалқымалы терезеде көрсету керек пе?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Жаңа кірген контакт аты үшін фон түсі."
+
+#~ msgid "Event Type"
+#~ msgstr "Оқиға түрі"
+
+#~ msgid "Event desc"
+#~ msgstr "Оқиға анықтамасы"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Сервермен байланысты орнатқан жоқсыз"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Ресурстар ерегісуі"
 
@@ -11920,9 +12013,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Жеке хабарламаны жіберу..."
 
-#~ msgid "Send _File"
-#~ msgstr "_Файлды жіберу"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Қатысушылар"
@@ -14674,9 +14764,6 @@ msgstr "Плагин сәтсіз"
 #~ "таңдай аласыз.\n"
 #~ "Сонымен қатар файрвол баптауларын өзгертсеңіз де болады."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Тіркел_гілерді біріктіру"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP бұл компьютерде қолдануға болмайды"
 
@@ -15243,10 +15330,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Талап етеді: python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr ""
-#~ "Талап етеді: gnome-keyring пен python-gnome2-desktop, не kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/lt.po b/po/lt.po
index 704171ab6..a019aed4f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:55+0200\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
 "Language-Team: Lithuanian <>\n"
@@ -17,73 +17,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Prieiga"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "ir patvirtintas"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "ir NEpatvirtintas"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Choose Image"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr ""
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Do _not ask me again"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Privatus sąrašas"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Saved in: %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Tęsti"
 
@@ -152,498 +158,493 @@ msgstr ""
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Rodyti _Atsijungusius Asmenis"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Siųsti Vieną Ži_nutę"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Vykdyti komandą"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Valdyti Pernašą"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Keisti Pernašą"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Pervadinti"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Trinti"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informacija"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Siųsti _Failą"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Save File as..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Save File as..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Last status: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Kviesti Kontaktus"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Įtraukti asmenį..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "File Transfer Request"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Private Chat"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Informacija"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Istorija"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Disabled"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Kuriama"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Visos būklės"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Kviesti Kontaktus"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Leave Groupchats"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Leave Groupchats"
+msgid "Rename…"
+msgstr "_Pervadinti"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Keisti _Temą..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Leave Groupchats"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Choose Image"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "New Group Chat"
+msgid "Configure…"
+msgstr "_Konfigūruoti"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Description"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registracija nesėkminga"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Nustatytos žinutės:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Keisti _Slapyvardį..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Balsas"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Vykdyti komandą"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i days ago"
 msgstr[1] "%i days ago"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Kuriama"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Visos būklės"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Įtraukti asmenį..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Siųsti Vieną Ži_nutę"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Ieškoti Paslaugų"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Išplėstinis"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nustatymai"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban List"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Žy_mės"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Kambario nustatymai"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Sinchronizuoti kontaktus"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Adminas"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Siųsti Žinutę Serveriui..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Nustatyti MOTD..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Atnaujinti MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Trinti MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Įtraukti asmenį..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Keisti Prieigą"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Keisti Prieigą"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Prieiga"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopijuoti JID/El. pašto adresą"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Įtraukti asmenį..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopijuoti nuorodos adresą"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Atverti nuorodą naršyklėje"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopijuoti JID/El. pašto adresą"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Atidaryti el. pašto programą"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopijuoti nuorodos adresą"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Padėtis:"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopijuoti JID/El. pašto adresą"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Pak_viesti"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Išspirti"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Banas"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Owner"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Adminas"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Member"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Member"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Balsas"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Kambario JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "message"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Šyp_senėlės:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM Address:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr ""
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -651,307 +652,312 @@ msgstr ""
 msgid "Nickname"
 msgstr ""
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr ""
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "creating logs database"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
 "reusable. This operation may take a while."
 msgstr ""
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Išvalyti"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "You"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Trinti"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Atšaukti sutikimą"
 msgstr[1] "Atšaukti sutikimą"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Žinutė pagal nutylėjimą"
 msgstr[1] "Žinutė pagal nutylėjimą"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Do you accept this request?"
 msgstr[1] "Do you accept this request?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Bendros parinktys"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Group"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "In the group"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr ""
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Joks"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Status Message"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr ""
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Status Message"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Išsaugoti kaip nustatytą..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Please type a name for this status message"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Turiu "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Būklė"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Name"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Siųsti _Failą"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Save File as..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Failų siuntimai"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Invalid File"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "_Išspirti"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Ban List"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "File Transfer Request"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "You are not connected to the server"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informacija apie jus, kur yra išsaugota serveryje"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Groupchats"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Groupchats"
@@ -966,7 +972,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Avahi error"
@@ -995,22 +1001,22 @@ msgstr "Your new account has been successfully created"
 msgid "Failed to Configure Group Chat"
 msgstr "Leave Groupchats"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s is now %(status)s"
@@ -1134,80 +1140,80 @@ msgstr ""
 msgid "If you close this window, you will leave '%s'."
 msgstr ""
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr ""
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Rodyti formatavimo sąrašą"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "You just received a new message from \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Išsiųsti "
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "New Message"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Išsiųsti "
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1216,186 +1222,177 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s dabar %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Failų siuntimai"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Size: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Priimti"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "A_tsijungęs"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Atidaryti katalogą, kuriame yra failas"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Groupchat Invitation"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr ""
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Failo siuntimas sustabdytas"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Rodyti tik kontaktų _sąrašą"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Išplėstinis konfigūracijos redaktorius"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kambario nustatymai"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Start Chat"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transports"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Groupchats"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Authorisation has been sent"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Authorisation has been removed"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
@@ -1405,7 +1402,7 @@ msgstr "Now \"%s\" will always see you as offline."
 msgid "desynced"
 msgstr "Išplėstinis"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1423,7 +1420,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Išjungti"
@@ -1566,8 +1564,8 @@ msgstr "Leave Groupchats"
 msgid "Please enter a new name"
 msgstr "Kurti naują pranešimą"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Pe_rvadinti"
@@ -1585,46 +1583,51 @@ msgstr ""
 msgid "_Also remove all contacts of this group from contact list"
 msgstr ""
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Leave Groupchats"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Please type a new username for your local account"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr ""
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1633,154 +1636,155 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr ""
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
 msgstr ""
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Pervadinti Prieigą"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr ""
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr ""
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Sends file to a contact"
 msgstr[1] "Sends file to a contact"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr ""
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Sends file to a contact"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr ""
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr ""
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Visiems naudotojams"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr ""
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Redaguoti _Grupes"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Trinti"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Pe_rvadinti"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr ""
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "_Vykdyti komandą"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Istorija"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "History Manager"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observers"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1905,219 +1909,219 @@ msgstr "Private Chats"
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr ""
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Do you accept this request?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Authorisation has been sent"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Authorisation has been sent"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Joks"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Sutikimo užklausimas"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Sutikimo užklausimas"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr ""
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr ""
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Passphrase Required"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Password Required"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Save password"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Removes contact from roster"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Unable to load idle module"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Failų siuntimai"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Nesaugus ryšys"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2125,20 +2129,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr ""
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Jungiamasi"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2340,11 +2344,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard publication failed"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2661,78 +2665,73 @@ msgid ""
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "creating %s directory"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr ""
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "New Single Message from %(nickname)s"
 msgstr[1] "New Single Message from %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "New Group Chat"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Authentication failed with \"%s\""
@@ -2797,64 +2796,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Pranešti apie _prisijungusius kontaktus"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Pranešti apie _atsijungusius kontaktus"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "_Rodyti įvykį kontaktų sąraše"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Pranešti, kai failo siuntimas bus baigtas"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Pranešti, kai failo siuntimas bus baigtas"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Background colour of contacts when they just signed in."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "įprastas"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Language used by speller"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2864,15 +2821,15 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2880,7 +2837,7 @@ msgid ""
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2889,7 +2846,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2898,17 +2855,17 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2920,22 +2877,22 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr "Jei pažymėta, Gajim rodys kontaktų nuotaiką sąrašo lange"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -2944,30 +2901,30 @@ msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -2976,11 +2933,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -2989,52 +2946,52 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
 msgstr ""
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3042,7 +2999,7 @@ msgid ""
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3052,22 +3009,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"If True, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3076,12 +3024,12 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3090,26 +3038,26 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3119,7 +3067,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3131,7 +3079,7 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3139,32 +3087,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Hides the banner in a group chat window"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Hides the banner in a group chat window"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3173,18 +3121,18 @@ 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."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3193,7 +3141,7 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3202,7 +3150,7 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3213,7 +3161,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."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3222,92 +3170,84 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3315,37 +3255,37 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3353,7 +3293,7 @@ msgid ""
 msgstr ""
 "Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3361,7 +3301,7 @@ msgid ""
 msgstr ""
 "Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3369,7 +3309,7 @@ msgid ""
 msgstr ""
 "Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3377,7 +3317,7 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3385,28 +3325,32 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Žy_mės"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3415,61 +3359,61 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr ""
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "You are not connected to the server"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3478,34 +3422,34 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s wants to send you a file."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, 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"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3514,28 +3458,24 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Adding Special Notification for %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3543,41 +3483,41 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3585,91 +3525,91 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Back soon"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Eating"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "I'm working."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Movie"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Working"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "I'm working."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Phone"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Out"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "I'm available."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Be right back."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3678,1059 +3618,1059 @@ 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."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Kam"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "None"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Groupchats"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Groupchat Invitation"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Groupchat Invitation"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Group Chat"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Groupchats"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "None"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Group chat creation is restricted."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "New Group Chat"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "The service could not be found"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "This is not a group chat"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Account Local already exists."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Groupchats"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr ""
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr ""
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr ""
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr ""
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr ""
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Neaktyvus"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr ""
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr ""
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr ""
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr ""
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr ""
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr ""
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr ""
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr ""
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr ""
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr ""
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr ""
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr ""
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr ""
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr ""
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr ""
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr ""
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr ""
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "įprastas"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr ""
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Šalis:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Prieiga"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Description"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Avahi error"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "vienas"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "room"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Nepavyksta iškoduoti siuntėjo viešojo rakto"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "The status has been changed."
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Kambario nustatymai"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Passphrase Required"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Authorisation accepted"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Account name is in use"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Passphrase Required"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Encryption enabled"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Authentication failed with \"%s\""
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Authentication failed with \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4792,12 +4732,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kambario nustatymai"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4809,244 +4749,214 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr ""
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr ""
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr ""
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr ""
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Užimtas"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Užimtas"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Nepasiekiamas"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Esu išėjęs"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Laisvas Pokalbiams"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Laisvas Pokalbiams"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Prisijungęs"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "All"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Nuėjęs"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Manęs nėra"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "A_tsijungęs"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Būklė nežinoma"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Būklė klaidinga"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Joks"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Kam"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Nuo"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Abu"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Klientas:"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Joks"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderators"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Visitors"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Visitor"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Owner"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Owner"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Member"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Member"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "is composing a message..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d žinutė laukia"
 msgstr[1] "%d žinutės laukia"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "pokalbiuose _grupėje"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Nuo"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5054,49 +4964,38 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Unable to load idle module"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is a file but it should be a directory"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
@@ -5196,84 +5095,84 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "File path"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Encryption disabled"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Change status information"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Change status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Online"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Extended away"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Siųsti kontaktus:"
 
@@ -5296,7 +5195,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Prieiga"
 
@@ -5307,7 +5206,7 @@ msgstr "Groupchats"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Slaptažodis:"
@@ -5331,7 +5230,7 @@ msgstr "pokalbiuose _grupėje"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Jungtis"
@@ -5349,17 +5248,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Atšaukti"
 
@@ -5506,7 +5405,7 @@ msgstr "Asmens Informacija"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Description"
 
@@ -5713,39 +5612,44 @@ msgstr "Darbas"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Apie"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Back soon"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Jungtis"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Gajim account %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5814,6 +5718,7 @@ msgid "Strike"
 msgstr "Perbraukimas"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Colour"
 
@@ -5826,135 +5731,130 @@ msgstr "Šriftas"
 msgid "Clear formatting"
 msgstr "Valyti formatavimą"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Choose File to Send..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Banning..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "A_fter nickname:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Keisti _Slapyvardį..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Keisti _Temą..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Įveskite naują slaptažodį:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Leave Groupchats"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Jei pažymėta, Gajim, startuodamas jungsis prie šio pokalbio grupėje"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Įvyko klaida:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Participant"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Išspirti"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Participant"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Banas"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "New Group Chat"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Description"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Reason"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Įveskite naują prieigos %s pavadinimą"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Pak_viesti"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Event"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Įvykiai"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6052,20 +5952,20 @@ msgid "Add"
 msgstr "Įtraukti"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Trinti"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Šaltinis:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Būklė"
 
@@ -6075,7 +5975,7 @@ msgid "Client"
 msgstr "<b>Klientas:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Sistema:</b>"
@@ -6217,38 +6117,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Apjun_gti prieigas"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6257,12 +6158,12 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Rodyti asmenų _būklės žinutes kontaktų sąraše"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6271,52 +6172,52 @@ msgstr ""
 "Jei pažymėta, Gajim rodys žiničių būkles žemiau kontaktinio asmens vardo, "
 "kontaktų sąraše ir pokalbių grupėse"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Rodyti kontaktų nuotaikas sąraše"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Rūšiuoti kontaktus pagal būklę"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Siųsti kontaktus:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "pokalbiuose _grupėje"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Contact Disconnected"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6324,29 +6225,29 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "message contents"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Rodyti formatavimo sąrašą"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Rodyti asmenų _būklės žinutes kontaktų sąraše"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6355,58 +6256,58 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Unable to join group chat"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Unable to join group chat"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Registracija nesėkminga"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Show close button in tab?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6414,64 +6315,66 @@ msgid ""
 msgstr ""
 "Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Show close button in tab?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Last status: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Pokalbis"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Naujam įvykiui įvykus:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Leisti pop-up/informavimą, kai esu _nuėjęs/nepasiekamas/užimtas/namatomas"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Leisti pop-up/informavimą, kai esu _nuėjęs/nepasiekamas/užimtas/namatomas"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Pranešti apie _prisijungusius kontaktus"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6480,61 +6383,61 @@ msgstr ""
 "Gajim praneš apie naujus įvykius iššokančiame langelyje, kuris pasirodys "
 "dešiniajame apatiniame ekrano kampe"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Pranešti apie _atsijungusius kontaktus"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Vizualinis informavimas</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Groti _garsus"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Val_dyti..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav Sounds"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Pranešimai"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Esu išėjęs"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6542,7 +6445,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6550,108 +6453,108 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutės"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "_Nustatyti būklei"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Prašyti įvesti būklės žinutę, kai aš:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Pr_isijungti"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Atsijungti"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Žinutė pagal nutylėjimą"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Įjungtas"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Status Message"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Nustatytosios būklės žinutės</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Theme"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Theme"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Nustatyti sąsajos spalvą ir šriftą"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Būklės _piktogramų rinkinys:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Naudoti _pernašos piktogramas"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6661,117 +6564,127 @@ msgstr ""
 "(pvz.: asmuo iš MSN protokolo turės atitinkamą MSN paveiksliuką būklei "
 "„prisijungęs“, „nuėjęs“, „užimtas“ atvaizduoti... )"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Stilius"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Savybės"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Žinutė pagal nutylėjimą"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Private Chat"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Prisijungimas"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Serveris:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Valdyti..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Įvairūs</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Išplėstinis konfigūracijos redaktorius"
@@ -6948,12 +6861,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Įveskite naują slaptažodį:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Išplėstiniai veiksmai"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Naudoti parinktą serverio adresą/prievadą"
@@ -7040,7 +6953,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Pr_isijungti"
@@ -7054,7 +6967,7 @@ msgstr "Kurti naują pranešimą"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7083,8 +6996,8 @@ msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 msgid "Resets value to default"
 msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Serverio adresas: "
@@ -7128,7 +7041,7 @@ msgstr "Blogas CA sertifikatas"
 msgid "Proxy Host"
 msgstr "Proksi _Serveris:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Type"
 
@@ -7142,8 +7055,7 @@ msgstr "_Protokolas:"
 msgid "Copy info to clipboard"
 msgstr "_Kopijuoti nuorodos adresą"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Savybės"
 
@@ -7326,6 +7238,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Keisti Būklės Žinutę"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Nuotaika:</b>"
@@ -7400,8 +7317,8 @@ msgstr ""
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7590,80 +7507,106 @@ msgstr "Registracija nesėkminga"
 msgid "_Name"
 msgstr "_Pavadinimas:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proksis:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Start Chat"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Leave Groupchats"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "History Manager"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Registracija nesėkminga"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Parinktys"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Išjungti"
+msgid "_Accounts"
+msgstr "Prieiga"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Rodinys"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Rodyti _Atsijungusius Asmenis"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Rodyti _Pernašas"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML Console"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Failų siuntimai"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Pagalba"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Savybės"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Apie"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7678,6 +7621,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Leave Groupchats"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -7955,61 +7903,69 @@ msgstr "Contact Disconnected"
 msgid "Create new group chat"
 msgstr "Leave Groupchats"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Parinktys"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Failų siuntimai"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "status message"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Rodyti _XML konsolę"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Pokalbio Išvaizda</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Rodyti _Atsijungusius Asmenis"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 #, fuzzy
 msgid "Contacts"
 msgstr "Asmuo"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Asmens Informacija"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Pervadinti Prieigą"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Siųsti kontaktus:"
@@ -8084,12 +8040,16 @@ msgstr "Užpildykite formą."
 msgid "Group Chat Configuration"
 msgstr "Groupchat Invitation"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML Console"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Pradėti pokalbį..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filtras:"
@@ -8134,11 +8094,6 @@ msgstr "Rodyti Visus Laukiančius Į_vykius"
 msgid "Mute Sounds"
 msgstr "Išjungti Garsus"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Parinktys"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8457,124 +8412,124 @@ msgstr "File transfer of %(filename)s from %(name)s stopped."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "None"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "Unable to join group chat"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "None"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Group Chat Message Highlight"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "None"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "This group chat has no subject"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Groupchats"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "None"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Groupchat Invitation"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "You are not connected to the server"
@@ -8603,7 +8558,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Recipient: "
 
@@ -8756,7 +8711,7 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Sender: "
 
@@ -8771,7 +8726,7 @@ msgid "Change"
 msgstr "Keisti _Slapyvardį..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Back soon"
@@ -8802,11 +8757,12 @@ msgid "Password Change Failed"
 msgstr "Password Required"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "An error occurred during account creation"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Keisti slaptažodį"
 
@@ -8841,72 +8797,67 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Pokalbio tęsinys"
+msgid "Start / Join Chat"
+msgstr "Start Chat"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Įtraukti asmenį..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s not found"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
 msgstr ""
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Others"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Pokalbiai _Grupėje"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8914,142 +8865,142 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr ""
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Browse"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Commands: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Ieškoti"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Redaguoti"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Users"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Prijungti naują asmenį"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr ""
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Siųsti Vieną Žinutę"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "subject"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Single Message"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr ""
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
@@ -9095,91 +9046,75 @@ msgstr "Registracija sėkminga"
 msgid "Registration failed"
 msgstr "Registracija nesėkminga"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Dictionary for lang %s not available"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"You have to install %s dictionary to use spellchecking, or choose another "
-"language by setting the speller_language option."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "Įveskite naują prieigos %s pavadinimą"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Number:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Groupchat Invitation"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -9194,6 +9129,11 @@ msgstr "GG Number:"
 msgid "ICQ Number"
 msgstr "ICQ Number:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Įtraukti asmenį..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9249,7 +9189,7 @@ msgstr "Error while adding service. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9411,42 +9351,62 @@ msgstr "Contact Disconnected"
 msgid "Contact Connected Background "
 msgstr "Contact Connected"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Status Message"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Status Message"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Status Message"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Status Message"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Invalid File"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Nickname not allowed: %s"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Do you accept this request?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr ""
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Active"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Registracija nesėkminga"
@@ -9470,10 +9430,9 @@ msgid "Error: %s"
 msgstr ""
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr ""
 
@@ -9487,48 +9446,48 @@ msgstr ""
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "All files"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Failų siuntimai"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Proxi profilių valdymas"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proksis:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Nustatyti būklei"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Atsijungęs"
@@ -9549,7 +9508,7 @@ msgstr "Prieiga"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Your new account has been successfully created"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9581,60 +9540,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Sinchronizuoti kontaktus"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "What do you want to do?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Jungiamasi"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Persiųsti neskaitytas žinutes"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber klientas"
@@ -9691,127 +9655,127 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Choose File to Send..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Choose Image"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "All files"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "All files"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Siųsti _Failą"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Images"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Choose Image"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "All files"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Save File as..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Atsijungta"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Filename: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Group Chats"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Failo siuntimas sustabdytas"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "All"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "All"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Aprašymas: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "All"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "All"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 #, fuzzy
 msgid "?transfer status:Paused"
 msgstr "All"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "All"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "All"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "All"
@@ -9820,7 +9784,7 @@ msgstr "All"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Invalid File"
@@ -9876,26 +9840,26 @@ msgstr "Group Chat Message Highlight"
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Password Required"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Joks"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Atšaukti"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -9914,11 +9878,6 @@ msgstr ""
 msgid "Hide _Contact List"
 msgstr "Kviesti Kontaktus"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Rodyti Tik _Aktyvius Kontaktus"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Hide this menu"
@@ -9968,36 +9927,31 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Nustatymai"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Nustatymai"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "You are not connected to the server"
+msgid "Archiving Preferences Error"
+msgstr "_Nustatymai"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Jūs gavote naują įrašą:"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Nustatymai"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Activated"
@@ -10046,172 +10000,171 @@ msgstr "Joks"
 msgid "?password:Hidden"
 msgstr "Slaptažodis:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Nustatymai"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Automatinio nebuvimo būklės žinutė"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Prisijungimas"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "_Balsas"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Automatinio nebuvimo būklės žinutė"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Pranešimai"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Password Required"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Save password"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
+#: gajim/gtk/features.py:129
+msgid "Requires: gnome-keyring or kwallet"
 msgstr ""
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Nustatymai"
@@ -10257,7 +10210,7 @@ msgstr ""
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Kviesti Kontaktus"
@@ -10285,7 +10238,7 @@ msgstr "_Baigti"
 msgid "Commands"
 msgstr "Commands: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10356,119 +10309,133 @@ msgstr "Subscription request from %s"
 msgid "Loading"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Prisijungta"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Prisijungti"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Gajim account %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Spauskite, kad pakeisti prieigos slaptažodį"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Jungiamasi"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Your server doesn't support Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Nickname not allowed: %s"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Your server doesn't support Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti prie proksi"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Įtraukti asmenį..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Kurti naują pranešimą"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Custom port must be a port number."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Išplėstiniai veiksmai"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Saved in: %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Kambario nustatymai"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Gajim account %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Register to %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Prieiga"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Prieiga"
@@ -10511,249 +10478,253 @@ msgstr "Ieškoti"
 msgid "No results found"
 msgstr "%s not found"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Default"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "status message title"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "status message text"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Relogin now?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Relogin now?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Please check if avahi-daemon is running."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Please check if avahi-daemon is running."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Prieiga"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Prieiga"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kviesti Kontaktus"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Blogas CA sertifikatas"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Prisijungti, kai Gajim pasileis"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Saugoti visų asmenų pokalbių žurnalus"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Visos būklės"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Naudoti failų siuntimo proksius"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " since %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kviesti Kontaktus"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignoruoti įvykius nuo asmenų nesančių kontaktų sąraše"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "_Prioritetas:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Connection not available"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Vardas:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Pavardė:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "New E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Nustatyti būklei"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Įjungti"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Portas:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Prisijungimas"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Blogas CA sertifikatas"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Save password"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registracija nesėkminga"
@@ -10804,19 +10775,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Removes contact from roster"
 msgstr[1] "Removes contact from roster"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10828,20 +10799,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Žy_mės"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -10896,127 +10867,216 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Savybės"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Service Discovery using account %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Asmuo"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Groupchats"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Nesenai:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Registracija nesėkminga"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Pokalbio tęsinys"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Dictionary for lang %s not available"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "You have to install %s dictionary to use spellchecking, or choose another "
+#~ "language by setting the speller_language option."
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Išjungti"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Rodyti Tik _Aktyvius Kontaktus"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Įtraukti asmenį..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Kviesti Kontaktus"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Leave Groupchats"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "New Group Chat"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "If True, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Pranešti apie _prisijungusius kontaktus"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Pranešti apie _atsijungusius kontaktus"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "_Rodyti įvykį kontaktų sąraše"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Pranešti, kai failo siuntimas bus baigtas"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Pranešti, kai failo siuntimas bus baigtas"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Background colour of contacts when they just signed in."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Event"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Įvykiai"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "You are not connected to the server"
+
+#, fuzzy
 #~ msgid "Unable to load image"
 #~ msgstr "Unable to load idle module"
 
@@ -11467,9 +11527,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Siųsti privačią žinutę"
 
-#~ msgid "Send _File"
-#~ msgstr "Siųsti _Failą"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Participants"
@@ -13012,10 +13069,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "uri"
 #~ msgstr "uri"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Registracija nesėkminga"
-
 #~ msgid "cyan"
 #~ msgstr "cyan"
 
@@ -13365,9 +13418,6 @@ msgstr "Registracija nesėkminga"
 #~ "neatitinka jūsų nustatymų, čia galite pasirinkti kitą.\n"
 #~ "Turėtumėte pakeisti leistinus ugniasienės nustatymus."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Apjun_gti prieigas"
-
 #~ msgid "To change the account name, you must be disconnected."
 #~ msgstr "To change the account name, you must be disconnected."
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index ce091bfde..e318c014a 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: <>\n"
@@ -17,74 +17,80 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: -1,775,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Kontoer"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "og identitetsbekreftet"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "og IKKE identitetsbekreftet"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s kryptering er aktiv %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Angre"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Velg bilde"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Du er i ferd med å lokke flerfoldige faner"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Er du sikker på at du vil forlate gruppesamtalen \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Personverns-liste"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Advarsel: %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "Dersom du sender en fil til %s, vil vedkommende kjenne din ekte JID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -149,479 +155,481 @@ msgstr "Ingen ventende abonnementsforespørsel."
 msgid " resource with priority "
 msgstr " ressurs med prioritet "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Vis _frakoblede kontakter"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Jeg vil legge deg til i kontaktlisten min."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Send enkelt_melding…"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "K_jør Kommando…"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Behandle transport"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Endre transport"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "_Gi nytt navn…"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Frigi"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokker"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Send _fil"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Lagre fil som…"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Lagre fil som…"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Siste tilstand"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+#, fuzzy
+msgid "Invite Contacts…"
 msgstr "Inviter _kontakter"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "Legg til kontakt…"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Forespørsel om lydsamtale"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Videotest"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "Informasjon"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "Historikk"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Avskrudd"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Bare skrivning"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Alle samtalestatuser"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Inviter _kontakter"
+msgid "All Chat States"
+msgstr "Alle samtalestatuser"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Forlat gruppesamtaler"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Forlat gruppesamtaler"
-
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
-msgstr "Endre emne"
+msgid "Rename…"
+msgstr "_Gi nytt navn…"
 
-#: gajim/gui_menu_builder.py:579
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Configure Group Chat"
-msgstr "Forlat gruppesamtaler"
+msgid "Change Subject…"
+msgstr "Endre emne"
 
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Velg arkiv"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Ny gruppesamtale"
+msgid "Configure…"
+msgstr "_Sett opp"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Ødelegger %s"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Sludresnarveier"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Vis statusendringer"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
+#: gajim/gui_menu_builder.py:584
+#, fuzzy
+msgid "Notify on all Messages"
 msgstr "Merknad ved alle meldinger"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Minimize on Close"
 msgstr "Minimer ved lukking"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Mini_mer ved automatisk deltakelse"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Endre _kallenavn…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "Forespør stemme"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "Kjør kommando"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+#, fuzzy
+msgid "Execute Command…"
+msgstr "K_jør Kommando…"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dager siden"
 msgstr[1] "%i dager siden"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Bare skrivning"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Alle samtalestatuser"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "Legg til kontakt…"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Send enkelt_melding…"
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
 msgstr "Oppdag tjenester"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "Tjenerinfo"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avansert"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "Arkiveringsinnstillinger"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Liste over bannlyste"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Oppsett"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "Synchronise History…"
 msgstr "Synkroniser historikk"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Personvernslister"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Send tjenermelding…"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Sett MOTD…"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Oppdater MOTD…"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Slett MFD (MOTD)…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "Legg til kontakt…"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Rediger Konto"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Rediger Konto"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopier JID/E-postadresse"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
 msgstr "Ta del i gruppesludring"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Start samtale"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "Legg til kontakt…"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopier lenke-plassering"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopier JID/E-postadresse"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Åpne E-post-behandler"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopier lenke-plassering"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Plassering:"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopier JID/E-postadresse"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "In_viter"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Frigi"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Blokker"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Kast ut"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Bannlys"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Eier"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Medlem"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Medlem"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "Forespør stemme"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Rom-JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Valg:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Vis denne hjelpemeldingen og avslutt"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Velg mappe for loggføring"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Finner ikke loggføringsdatabasen for historikk"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Fila finnes ikke"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM-adresse:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -629,28 +637,28 @@ msgstr "Dato"
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Melding"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Opprenskning av database"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "oppretter mellomlager for logg-database"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -663,191 +671,191 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vent..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Rydd _opp"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Du"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s sa: %(message)s %(time)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Slett"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Bekreftelse av sletting"
 msgstr[1] "Bekreftelse av sletting"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Ønsker du å slette valgt melding?"
 msgstr[1] "Ønsker du å slette valgt melding?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Forvalgt melding"
 msgstr[1] "Forvalgt melding"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Ønsker du å slette valgt melding?"
 msgstr[1] "Ønsker du å slette valgte meldinger?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnavn: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Generelt"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Gruppe"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "I gruppen"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Angi humør"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ingen"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusmelding"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Statusmelding"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 #, fuzzy
 msgid "Overwrite"
 msgstr "Overskriv?"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Overskriv statusmelding?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne "
 "statusmeldingen?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Overskriv?"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Statusmelding"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Lagre som forvalg…"
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Skriv inn et navn for denne statusmeldingen"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Lagre _som"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet tjeneren"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke flette kontakter uten å være tilkoblet."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Navn"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Tjener"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet tjeneren"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan ikke flette med en konto uten å være tilkoblet."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Flett"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "en lyd og video"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "en lyd"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "en video"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -856,93 +864,98 @@ msgstr ""
 "%(contact)s ønsker å starte %(type)s økt med deg. Ønsker du å besvare denne "
 "forespørselen?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Send _fil"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Lagre fil som…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 msgid "No File Transfer available"
 msgstr "Ingen filoverføringer tilgjengelig"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Ugyldig fil"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Kunne ikke laste inn bilde"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Kaster ut %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Liste over bannlyste"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Skriv inn kallenavn"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Forespørsel om lydsamtale"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s satt temaet til %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Rommet viser nå utilgjengelige medlemmer"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Rommet viser nå utilgjengelige medlemmer"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr "En innstilling som ikke har med personvern å gjøre har blitt endret"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Denne økta VIL bli arkivert på tjeneren"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informasjon om deg, slik som den er lagret på tjeneren"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymt"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymt"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Rommet er nå helt anonymt"
@@ -957,7 +970,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Feil."
 
@@ -986,22 +999,22 @@ msgstr "Et nytt rom har blitt opprettet"
 msgid "Failed to Configure Group Chat"
 msgstr "Forlat gruppesamtaler"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du går nå under navnet %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s går nå under navnet %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Du går nå under navnet %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s er nå %(status)s"
@@ -1129,79 +1142,79 @@ msgid "If you close this window, you will leave '%s'."
 msgstr ""
 "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s har blitt invitert til dette rommet"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Vis formateringsliste"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Denne kontakten støtter ikke HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s tilstand : %(state)s, grunn: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Se bort fra denne feilen for dette sertifikatet."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Lukk"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Ny melding"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr "_Lukk"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1210,179 +1223,170 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s er nå %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "Filoverføring"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Størrelse"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_Godkjenn"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Frakoblet"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Filoverføring fullført"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "Åpne _inneholdende mappe"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Invitasjon til gruppesamtale"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Kontakten stoppet overføringen"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Feil under åpning av fil"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Filoverføring stoppet"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Filoverføring avbrutt"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen med likemann kan ikke opprettes."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr "Vis programversjon"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "Bare vis kritiske feil"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 #, fuzzy
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr "Del profilene helt (selv historikkdatabase og programtillegg)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr "Skriv ut XML-stanza-er og annen feilrettingsinformasjon"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Bruk definert profil i oppsettsmappe"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Velg oppsettsmappe"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Sett opp loggføringssystem"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "Vis alle advarsler"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Viser et oppsprettsvindu med neste ventende hendelse"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Start ny samtale"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Database-feil"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Gruppesamtaler"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr "Godkjenning sendt"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "\"%s\" vil nå kunne se din status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Abonnementsforespørselen har blitt sendt"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Hvis \"%s\" godtar denne forespørselen vil du få kjennskap til vedkommendes "
 "status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
 msgstr "Godkjenning fjernet"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" se deg som frakoblet."
@@ -1392,7 +1396,7 @@ msgstr "Nå vil \"%s\" se deg som frakoblet."
 msgid "desynced"
 msgstr "usynkronisert"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr "Avslutt Gajim"
 
@@ -1411,7 +1415,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Alltid lukk Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Avslutt"
 
@@ -1570,8 +1575,8 @@ msgstr "Gi gruppe nytt navn"
 msgid "Please enter a new name"
 msgstr "Velg en ny og ren drakt."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Gi _nytt navn"
@@ -1590,28 +1595,33 @@ msgstr "Ønsker du å fjerne gruppen %s fra kontaktlista?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Fjern også alle kontaktene i denne gruppa fra kontaktlista di"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Forlat gruppesamtaler"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Skriv inn nytt brukernavn for din lokale konto"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Gi kontakt nytt navn"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Fjerner kontakt fra kontaktliste"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr ""
 "Du er i ferd med å fjerne \"%(name)s\" (%(jid)s) fra kontaktlista di.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1620,21 +1630,21 @@ msgstr ""
 "Ved å fjerne disse kontaktene fjerner du også autorisasjonen, noe som gjør "
 "at de alltid vil se deg som frakoblet."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Jeg ønsker at kontakten skal kunne se min status etter fjerning"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Fjerner kontakt fra kontaktliste"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1645,24 +1655,24 @@ msgstr ""
 "Ved å fjerne disse kontaktene fjerner du også autorisasjonen, noe som gjør "
 "at de alltid vil se deg som frakoblet."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Gi kontakt nytt navn"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du må opprette en konto før du kan føre samtaler med andre kontakter."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Du mangler støtte for lagring av metakontakter på tjeneren din"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1670,14 +1680,14 @@ msgstr ""
 "Tjeneren din støtter ikke lagring av metakontaktinformasjon. Denne "
 "informasjonen vil ikke være lagret neste gang du kobler til."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Du er i ferd med å opprette en metakontakt. Er du sikker på at du vil "
 "fortsette?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1687,120 +1697,120 @@ msgstr ""
 "Metakontakter er en måte å omgruppere flere kontakter på én linje. Generelt "
 "brukes dette når samme person har flere XMPP- eller transport-kontoer."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Gi kontakt nytt navn"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativ"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil-URI:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Ønsker du å sende denne fila til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Send"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %(from)s til %(to)s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "Gjør %s til første kontakt"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Gjør %(contact1)s og %(contact2)s til metakontakter"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Endre statusmelding"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Offentliggjør melodi"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Offentliggjør plassering"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maksimer alle"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Send gruppe_melding"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Behandle kontakter"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "Rediger _grupper…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "__Maksimer"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Koble til på ny"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "Kjør kommando"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historikk"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historikk-behandler"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observatører"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1929,70 +1939,70 @@ msgstr "Private samtaler"
 msgid "Messages"
 msgstr "Meldinger"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s)-gjodkjenning for %(url)s (ID: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Godtar du denne forespørselen på %s-kontoen?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Godkjenning sendt"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Godkjenning sendt"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ingen"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Tilkobling mislyktes"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved forsendelse av %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Abonnementsforespørsel"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Godkjenning godtatt"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se vedkommendes status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Abonnements-forespørsel"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kontakten \"%s\" abonnerer ikke lengre på deg"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2001,147 +2011,147 @@ msgstr ""
 "Du vil alltid se dem som frakoblet.\n"
 "Ønsker du å fjerne dem fra kontaktlisten din?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Abonnement opphevet"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s avslo invitasjonen: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s avslo invitasjonen"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Du er invitert {room} av {user}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "Sertifikat-passord kreves"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Skriv in sertifikatspassordet for kontoen %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Passord påkrevd"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Filoverføring feilet"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg ei fil."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Filoverføringsforespørsel"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Kontakten stoppet overføringen"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Feil under åpning av fil"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Feil med SSL-sertifikat"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Filoverføring stoppet"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Filoverføring mislyktes"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s mottatt fra %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Filoverføringen %(filename)s fra %(name)s stoppet."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Filoverføringen %(filename)s fra %(name)s mislyktes."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har sendt %(filename)s til %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Filoverføringen %(filename)s til %(name)s har stoppet."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Filoverføringen %(filename)s til %(name)s mislyktes."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Brukernavn-konflikt"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Skriv inn nytt brukernavn for din lokale konto"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å starte en lydsamtale."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Forespørsel om lydsamtale"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Usikker tilkobling"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2152,20 +2162,20 @@ msgstr ""
 "vis. Dette betyr at samtaler vil foregå ukryptert, hvilket frarådes sterkt.\n"
 "Er du sikker på at du ønsker å gjøre dette?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Kobler til"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke lagre innstillinger"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2369,11 +2379,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard-publisering mislyktes"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Forsendelse av privat melding mislyktes"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2697,78 +2707,73 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke oppgitt. \n"
 "Skriv \"%(basename)s help %(command)s\" for mer info"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er en katalog men skulle vært ei fil"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Ødelegger %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Ukjent SSL-feil: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Ny privat melding"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Ny melding fra %(nickname)s"
 msgstr[1] "Ny melding fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Ny gruppesamtale"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s endret status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "En kontakt endret status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s logget inn"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "En kontakt logget inn"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s logget ut"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "En kontakt logget ut"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Identitetsbekreftelse feilet med følgende, \"%s\""
@@ -2844,65 +2849,23 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Varsle meg om kontakter som logger _inn"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Varsle meg om kontakter som logger _ut"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Ny meldingsmerknadsfarge."
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Gi meg beskjed når ei filoverføring er fullført"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Gi meg beskjed når ei filoverføring er fullført"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på"
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Liste (inndelt med mellomrom) av rader (kontoer og grupper) som er foldet "
 "sammen."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "forvalg"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Språk brukt av staveren"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2912,15 +2875,15 @@ msgstr ""
 "'noen ganger' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
 "'aldri' - aldri vis klokkeslett."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _-par som mulig inndeling av formateringstegn."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2929,7 +2892,7 @@ msgstr ""
 "Dersom sant, ikke fjern */_ . Slik at *abc* vil bli uthevet men * * ikke "
 "fjernet."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2938,7 +2901,7 @@ msgstr ""
 "Tegn å legge til etter kallenavn ved bruk av kallenavns-fullføring (tab) i "
 "gruppesamtaler."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2947,7 +2910,7 @@ msgstr ""
 "Tegnforslag å legge til etter ønsket kallenavn når det ønskede kallenavnet "
 "brukes av noen andre i samtalegruppen."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 #, fuzzy
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
@@ -2956,12 +2919,12 @@ msgstr ""
 "Hvis sant vil Gajim lagre kontaktlisteposisjon når den blir skjult, og "
 "gjennoprette den når den vises."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 #, fuzzy
 msgid "Place the contact list on the right in single window mode"
 msgstr "Plasser kontaktlisten til høyre i enkeltvindusmodus"
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2974,22 +2937,22 @@ msgstr ""
 "på strftime for å en fullstendig beskrivelse: http://docs.python.org/lib/"
 "module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Tegn som skrives før kallenavnet i samtaler"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktlistevinduet"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -2998,7 +2961,7 @@ msgstr ""
 "Hvor mange meldinger skal gjenopprettes fra historikk når en samtale "
 "gjenåpnes?"
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 #, fuzzy
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
@@ -3006,7 +2969,7 @@ msgstr ""
 "Hvor langt tilbake (i minutter) historikk skal gjenopprettes. -1 betyr ingen "
 "grense."
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3016,19 +2979,19 @@ msgstr ""
 "samtale som du har blitt koblet fra forsøkes. Sett til 0 for å skru av "
 "automatisk ny tilkobling."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Send meldinger med Ctrl+Enter og lag ny linje med Enter (ICQ-klientens "
 "Mirabilis standardoppførsel)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3037,11 +3000,11 @@ msgstr ""
 "Enten bruk egendefinert nettadresse med %s i seg, hvor %s er ordet/frasen "
 "eller 'WIKTIONARY' som betyr bruk Wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne fjernstyres med gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3050,15 +3013,15 @@ msgstr ""
 "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
 "det hvert x minutt."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3067,7 +3030,7 @@ msgstr ""
 "Spør før samtalefaner lukkes hvis data kan gå tapt (samtaler, private "
 "samtaler, gruppesamtaler som ikke minimeres)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3077,31 +3040,31 @@ msgstr ""
 "grensesnitt, for filoverføring i tilfelle adresseoversetting/port-"
 "videresending."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-standarden tilsier at KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Varsle om hendelser i system-statusfeltområdet."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare én samtale?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis fanet notatblokk i samtalevinduer?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Vis lukkingsknapp på fanen?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvis nye meldinger i oppsprettsvindu?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3109,7 +3072,7 @@ msgid ""
 msgstr ""
 "En semikoloninndelt liste over ord som vil bli uthevet i gruppesamtaler."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3120,7 +3083,7 @@ msgstr ""
 "trykket. Det blir kun tatt hensyn til dette dersom systemstatus-"
 "miniatyrbilde er i bruk."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 #, fuzzy
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
@@ -3129,16 +3092,7 @@ msgstr ""
 "Skjuler kontaktlistevinduet i Gajim ved å trykke på X-knappen istedenfor "
 "minimering til dokken."
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Hvis sant vil Gajim vise et miniatyrbilde på hver fane som inneholder uleste "
-"meldinger. Avhengig av valgt tema kan dette være animert."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3147,7 +3101,7 @@ msgstr ""
 "Hvis sant vil Gajim vise statusmeldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktlistevinduet."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
@@ -3155,7 +3109,7 @@ msgstr ""
 "Bestemmer posisjon for avataren i kontaktlisten. Kan være til venste eller "
 "høyre"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3164,26 +3118,26 @@ msgstr ""
 "Hvis usant vil du ikke lenger kunne se statuslinjer i samtaler når en "
 "kontakt endrer status og/eller statusmelding."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Kunne ikke ta del i gruppesamtale"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Kunne ikke ta del i gruppesamtale"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3193,7 +3147,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er hendelser på vent."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3214,7 +3168,7 @@ msgstr ""
 "'pertype' - Hver meldingstype (f.eks. sludreøkter, men ikke "
 "gruppesludringsøkter) blir sendt til et spesifikt vindu."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3227,32 +3181,32 @@ msgstr ""
 "'aldri' - Never show roster.\n"
 "'siste_tilstand' - Gjenopprett kontaktlisten i siste tilstand."
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Hvis usant vil du ikke lenger se avataren i samtalevinduet."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Hvis sant vil man kunne lukke fane/vindu med Esc-knappen."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Gjemmer tittelbanneret i gruppesamtalevinduer"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Gjemmer tittelbanneret i gruppesamtalevinduer"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Gjemmer rommets deltagerliste i gruppesamtalevinduet."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3261,18 +3215,18 @@ msgstr ""
 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er samme "
 "person som snakker som i foregående melding."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av påfallende kallenavn."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3281,7 +3235,7 @@ msgstr ""
 "Skal bekreftelse av kontaktblokkering vises eller ei? Tomt innhold betyr at "
 "dialogen aldri vises."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3290,7 +3244,7 @@ msgstr ""
 "Skal bekreftelse av kontaktblokkering vises eller ei? Tomt innhold betyr at "
 "dialogen aldri vises."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3301,7 +3255,7 @@ msgstr ""
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
 "prioritet vil du ikke motta noen meldinger fra din tjener."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3310,7 +3264,7 @@ msgstr ""
 "Hvis sant vil Gajim vise antall tilgjengelige og totalt antall kontakter og "
 "grupperader."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3319,22 +3273,18 @@ msgstr ""
 "Hvis sant vil Gajim rulle og velge kontakten som sist sendte deg en melding, "
 "om ikke samtalevinduet allerede er åpnet."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tid med inaktivitet før vinduet for endring av status lukkes."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Velg intervall mellom to uvirksomhetssjekker."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3343,7 +3293,7 @@ msgstr ""
 "Lovlige URI-handlesett. Bare skjema i denne listen vil bli akseptert som en "
 "\"ekte\" URI. (mailto og xmpp håndteres separat)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3351,24 +3301,24 @@ msgstr ""
 "Hvis sant vil komplettering i samtalerom gjøres slik som i skallbasert "
 "variant"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Alternativ fiksering av jingle-utdataens videoskuddtakt. Eksempelvis: 10/1 "
 "eller 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Alternativ justering av oppløsning for utdata-video. Eksempelvis: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3377,11 +3327,11 @@ msgstr ""
 "Gajim vil forsøke å bruke STUN-tjener ved bruk av Jingle. Valget er i "
 "\"stun_server\", eller det gitt av XMPP-tjeneren."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr "STUN-tjener til bruk med Jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3390,7 +3340,7 @@ msgstr ""
 "Hvis sant vil Gajim vise tilhørighet for deltagere i gruppesamtale ved å "
 "legge til en farget firkant i status-miniatyrbildet"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
@@ -3399,21 +3349,21 @@ msgstr ""
 "Mellomtjenere brukt for utgående tilkoblinger, hvis kontoen ikke har satt "
 "opp en spesifikk mellomtjener"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 #, fuzzy
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 "Hvis sant vil Gajim ignorere innkommende forespørsler om oppmerksomhet "
 "(\"wizz\")."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 "Hvis påskrudd vil Gajim presentere viduene fra sist gang Gajim ble lukket."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3422,12 +3372,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise et ikon for å gjøre oppmerksom på at sendt melding "
 "har ankommet kontakt"
 
-#: gajim/common/config.py:256
-#, fuzzy
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr "Vis en miniavatar i sludrevindusfaner og i vindusikonet"
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3435,38 +3380,38 @@ msgstr ""
 "Dersom sant vil Gajim bruke Gnome-nøkkelringen (dersom tilgjengelig) til å "
 "lagre kontopassord."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 #, fuzzy
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Kjøring av XEP-0146-kommandoer i Gajim."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3475,7 +3420,7 @@ msgstr ""
 "Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
 "bruker"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3484,7 +3429,7 @@ msgstr ""
 "Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
 "bruker"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3493,7 +3438,7 @@ msgstr ""
 "Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
 "bruker"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3502,7 +3447,7 @@ msgstr ""
 "Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
 "'avslått'."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3511,29 +3456,33 @@ msgstr ""
 "Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
 "'avslått'."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 #, fuzzy
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr "Kjøring av XEP-0146-kommandoer i Gajim."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Bokmerk rommet"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3542,7 +3491,7 @@ msgstr ""
 "Prioritet vil endres automatisk i følge med din status. Prioritet bestemmes "
 "i autopriority_*-valgene."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3553,19 +3502,19 @@ msgstr ""
 "'borte', 'lengre tids fravær', 'ikke forstyrr' eller 'usynlig'. MERK: dette "
 "valget brukes bare dersom restore_last_status er avskrudd"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Dersom valgt, gjenopprett sist brukte status."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Hvis sant vil kontakter som ber om godkjenning bli akseptert automatisk."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3574,12 +3523,12 @@ msgstr ""
 "Dersom usant vil bildeikoner bli slått av og ikke vises i "
 "kontaktlistevinduet."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Du er ikke tilkoblet tjeneren"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3588,15 +3537,15 @@ msgstr ""
 "Vis en advarselsdialog før forsendelse av passord over ukryptert tilkobling. "
 "Kan være 'advar', 'koble til' eller 'koble fra'"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
@@ -3606,7 +3555,7 @@ msgstr ""
 "Mellomromsinndelt liste over JID-er du ikke ønsker å logge. Du kan også "
 "legge til kontonavn for å ikke logge denne kontoen."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3615,7 +3564,7 @@ msgstr ""
 "Hvor mange sekunder skal det ventes på svar fra livstegns-ping før "
 "gjentilkobling?"
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3624,7 +3573,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og mellomtjenere bestemt i "
 "file_transfer_proxies-valget for filoverføring."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 #, fuzzy
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
@@ -3634,28 +3583,28 @@ msgstr ""
 "forsikre seg om at de virker. Openfire sine mellomtjenere feiler denne "
 "testen selv om de virker."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Hvis valgt vil Gajim vise et ikon for å gjøre oppmerksom på at sendt melding "
 "har ankommet kontakt"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Tillat Gajim å sende informasjon om hvilket operativsystem du bruker."
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Tillat Gajim å sende din lokale tid."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Melding sendt til kontakter du ønsker å legge til"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3664,7 +3613,7 @@ msgstr ""
 "Hvis påskrudd vil Gajim sende dine lokale IP-er slik at din kontakt kan "
 "koble til din maskin for å overføre filer."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
@@ -3673,12 +3622,7 @@ msgstr ""
 "Mellomromsinndelt liste over JID-er du vil gjenåpne samtalevindu med ved "
 "neste oppstart."
 
-#: gajim/common/config.py:349
-#, fuzzy
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr "HTTP-opplasting: Skru på HTTPS-bekrefting"
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 #, fuzzy
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
@@ -3687,12 +3631,12 @@ msgstr ""
 "Foretrukket filoverføringsmekanisme for dra-og-slipp -funksjonalitet i "
 "sludrevinduet. Kan være 'httpupload' (forvalg) eller 'jingle'"
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Bekreftelse av SSL-sertifikat for %s"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3701,43 +3645,43 @@ msgstr ""
 "Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
 "'avslått'."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Nåværende aktiv kryptering for nevnte kontakt"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 #, fuzzy
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 "Hvorvidt det er ønskelig med en merknad for hver melding i dette rommet"
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Kunne ikke ta del i gruppesamtale"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Kunne ikke ta del i gruppesamtale"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3746,7 +3690,7 @@ msgstr ""
 "Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
 "'avslått'."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3757,84 +3701,84 @@ msgstr ""
 "skrus av). Dette valget SKAL IKKE brukes til å (de)aktivere tillegg. Bruk "
 "GUI i steden for."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Straks tilbake"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Spiser"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Jeg jobber."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Ser på en film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Jobber"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Sitter i telefonen."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Ute"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Ute og lever livet."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Adjø!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3844,125 +3788,125 @@ msgstr ""
 "muc_highlight_words, eller når en melding i et samtalerom inneholder "
 "kallenavnet ditt."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Lyd som spilles når en MUC-melding ankommer."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Gruppesludringsstøtte"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Fremheving av gruppesamtale:"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Invitasjon til gruppesamtale"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Invitasjon til gruppesamtale"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Gruppe Samtale"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Gruppesludringsstøtte"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Oppretting av gruppesludring tillates ikke."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Ny gruppesamtale"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "%s er ikke en gruppesamtale-tjener"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Lokal konto eksisterer allerede."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Gruppesamtalen <b>%s</b> finnes ikke."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Historikk for gruppesamtaler"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr "Meldingen har blitt kryptert med OTR og kunne ikke dekrypteres."
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -3971,7 +3915,7 @@ msgstr ""
 "dekrypteres. Du kan installere PGP-programtillegget for å håndtere de "
 "meldingene."
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 #, fuzzy
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
@@ -3981,921 +3925,921 @@ msgstr ""
 "dekrypteres. Du kan installere PGP-programtillegget for å håndtere de "
 "meldingene."
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr "Meldingen har blitt kryptert med %s og kunne ikke dekrypteres."
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Utfører gjøremål"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Kjøper mat"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Vasker"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Lager mat"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Driver vedlikehold"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Tar oppvasken"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Vasker klær"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Gjør hagearbeid"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Løper et ærend"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Går tur med hunden"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Drikker"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Tar seg en øl"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Tar seg en kaffe"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Tar seg en kopp té"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Tar seg en matbit"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Spiser frokost"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Spiser middag"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Spiser lunsj"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Trimmer"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Sykler"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Danser"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "På tursti"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Jogger"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Bedriver sport"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Løper"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Går på ski"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Trener"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Steller seg"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "Er på spa"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Pusser tenner"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Klipper håret"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Barberer seg"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Tar et bad"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Tar seg en dusj"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Har en avtale"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Fridag"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Slapper av"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Gjemmer seg"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Ber"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Planlagt ferie"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Tenker"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Slapper av"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Fisker"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Spiller"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Går ut"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Fester"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Leser"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Sover"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Røyker"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Sosialiserer"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Soler seg"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Ser på TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Ser på film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Snakker"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "I det virkelige liv"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Sitter i telefonen"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "På videotelefon"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Reiser"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Pendler"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Kjører"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "I en bil"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "På bussen"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "Flyr"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "På toget"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "På reise"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Spaserer"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Koder"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "I et møte"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Studerer"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Skriver"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Redd"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Forbløffet"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Amorøs"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Er Bjørn Sundquist"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Irritert"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Engstelig"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Opphisset"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Skamfull"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Kjeder seg"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Modig"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Rolig"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Forsiktig"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Kald"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Selvsikker"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Forvirret"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Overveiende"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Utfordrende"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Gretten"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Gal"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Kreativ"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Nysgjerrig"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Nedslått"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Deprimert"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Vemmes"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Forferdet"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Distrahert"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Misunnelig"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Begeistret"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Flørtende"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustrert"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Takknemlig"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Sørgende"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Gretten"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Glad"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Håpefull"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Varm"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Ydmyk"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Ydmyket"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Sulten"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Såret"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Imponert"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Ærefrykt"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Forelsket"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Indignert"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Interessert"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Uovervinnelig"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Sjalu"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Ensom"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Bortkommet"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Heldig"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Slem"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Humørsyk"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervøs"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Nøytral"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Opprørt"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Leken"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Stolt"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Avslappet"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Lettet"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Rastløs"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Lei seg"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Tilfreds"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Seriøs"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Sjokkert"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Blyg"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Syk"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Stresset"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Sterk"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Takknemlig"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Tørst"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Trøtt"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Svak"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Bekymret"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "nøyaktighet"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "alt"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "område"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "kurs"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "bygning"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "land"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "landskode"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "dato"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "Beskrivelse"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "feil"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "etasje"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "breddegrad"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "samhold"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "lengdegrad"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "postnummer"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "fylke"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "rom"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "hastighet"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "gate"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "tekst"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "tidsstempel"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til innhente utsteders sertifikat"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til å skaffe sertifikatets CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til å dekryptere sertifikatets signatur"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til å dekryptere CRL-ens signatur"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Klarer ikke å dekode usteders offentlige nøkkel"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Sertifikat-signaturfeil"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "CRL-signaturfeil"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Sertifikatet er ikke gylig enda"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Sertifikatet har utløpt"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL er ikke gyldig enda"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL har utgått"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfeil i sertifkatets ikkeFør-felt"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfeil i sertifikatets ikkeEtter-felt"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfeil i CRL-ens sisteOppdatering-s-felt"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfeil i CRL-ens nesteOppdatering-s-felt"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Selvsignert sertifikat"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsignert sertifikat i sertifikatkjeden"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Ute av stand til å få tak i lokal utsteders sertifikat"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Ute av stand til å bekrefte det første sertifikatet"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Sertifikatskjeden er for lang"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Sertifikat tilbakekallt"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA-sertifikat"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Stilengde-begrensning overskredet"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Ikke støttet sertifkats-hensikt"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Sertifikatet er ikke tiltrodd"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Sertifikat avvist"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Emne-utsteder samsvarer ikke"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne-nøkkel-identifikator samsvarer ikke"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og utsteders seriernummer samsvarer ikke"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Nøkkelbruk inkluderer ikke sertifikatssignering"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Programbekreftelsesfeil"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Sertifikat tilbakekallt"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Ukjent SSL-feil: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Sertifikatet har utløpt"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Godkjenning godtatt"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Konto avskrudd"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Sertifikatet har utløpt"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Krypteringsfeil"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Tillegget støttes ikke"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Identitetsbekreftelse feilet med følgende, \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4956,12 +4900,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s oppsettsfeil"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4980,290 +4924,249 @@ msgstr ""
 "Feilen var:\n"
 "%(error)s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "lydinndata"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "lydutdata"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "videoinndata"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Tjeneren må være mellom 1 og 1023 byte"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Ugyldig tegn i vertsnavn."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Tjener-adresse kreves."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Brukernavnet må være mellom 1 og 1023 byte"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Ugyldig tegn i brukernavn."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "Ressursen må være mellom 1 og 1023 byte"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Ugyldig tegn i ressurs."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Opptatt"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Ikke tilgjengelig"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Ledig for prat"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Ledig for prat"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "?user status:_Tilgjengelig"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "?user status:Tilgjengelig"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "B_orte"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Borte"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feil"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Til"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Fra"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Begge"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Ukjent"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Deltakere"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Deltaker"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Besøk"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Eier"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Eier"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "fokuserer på samtalen"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 msgid "is composing a message…"
 msgstr ""
 "tilkjennegir blodets hvisken og benpipernes bøn fra det ubevisste sjeleliv…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "tok pause i meldingsskrivingen"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "i _gruppesamtaler"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr "fra brukeren %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "fra %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til i kontaktlisten min."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Hei, jeg er $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved innlasting av bilde"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Bildet er for stort"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "PyCURL er ikke intallert"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "Feil ved innlasting av bilde"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er ei fil men skulle ha vært en katalog"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
@@ -5368,85 +5271,85 @@ msgstr "Maskinen går i dvale"
 msgid "Disconnect from the network"
 msgstr "Koble fra nettverket"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Fila er tom"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Fila finnes ikke"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr "Filen er for stor, maksimal tillatt filstørrelse er: %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Krypterer fil…"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 #, fuzzy
 msgid "Requesting HTTP File Upload Slot…"
 msgstr "Forespør HTTP-opplastingsplass…"
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 #, fuzzy
 msgid "Uploading via HTTP File Upload…"
 msgstr "Laster opp fil via HTTP-filopplasting…"
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Endre statusinformasjon"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Endre status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Sett tilstedeværelses-type og beskrivelse"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Ledig for samtale"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Pålogget"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Utvidet fravær"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Frakoblet - koblet fra"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Tilstedeværelsesbeskrivelse:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Statusen har blitt endret."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Sendt kontakt: \"%(jid)s\" (%(name)s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Sendte kontakter:"
 
@@ -5470,7 +5373,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Konto"
 
@@ -5481,7 +5384,7 @@ msgstr "Gruppesamtaler"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 msgid "Password"
 msgstr "Passord"
 
@@ -5504,7 +5407,7 @@ msgstr "i _gruppesamtaler"
 msgid "Search group chats on selected server"
 msgstr "Søk i rommene på denne tjeneren"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
 msgstr "Ta del"
 
@@ -5522,17 +5425,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -5676,7 +5579,7 @@ msgstr "Kontaktinformasjon"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -5877,40 +5780,45 @@ msgstr "Jobb"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Om"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Ta del i gruppesamtale"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Straks tilbake"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Delta"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Fjerner kontoen %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "Tøm fil"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5980,6 +5888,7 @@ msgid "Strike"
 msgstr "Gjennomstrek"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Farge"
 
@@ -5991,137 +5900,133 @@ msgstr "Skrift"
 msgid "Clear formatting"
 msgstr "Fjern formatering"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Velg kryptering"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Vis en liste over smilefjes (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Bannlyser…"
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "E_tter kallenavn:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Endre kallenavn"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Endre emne"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Skriv inn nytt passord:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Forlat gruppesamtaler"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Dersom valgt vil Gajim automatisk ta del i gruppesamtalen ved oppstart"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>En feil har inntruffet:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Bekreft igjen…"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Deltaker"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 #, fuzzy
 msgid "Insert Emoji"
 msgstr "Skru på ASCII-smilefjes"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Du kan også skrive inn et alternativt møtested:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Deltaker"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Ny gruppesamtale"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Ødelegger %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Du kan også skrive inn et alternativt møtested:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Grunn"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Skriv inn nytt navn på gruppen %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "In_viter"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Hendelsestype"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Hendelsesbeskrivelse"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -6207,18 +6112,18 @@ msgid "Add"
 msgstr "Legg til"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 msgid "Remove"
 msgstr "Fjern"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 msgid "Resource"
 msgstr "Ressurs"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6228,7 +6133,7 @@ msgid "Client"
 msgstr "Klient:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "System"
 
@@ -6368,39 +6273,39 @@ msgstr "_Vindusoppførsel:"
 msgid "_Show contact list on startup"
 msgstr "_Vis kontaktliste ved oppstart:"
 
-#: gajim/data/gui/preferences_window.ui:311
-#, fuzzy
-msgid "Show _avatar in chat tabs"
-msgstr "Vis avatar i sludrefaner"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Sammenslåin_g av kontoer"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Viser a_vatarer for kontakter i kontaktlisten"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6409,12 +6314,12 @@ msgstr ""
 "Dersom valgt vil Gajim vise avatarer for kontakter i kontaktlistevinduet og "
 "i gruppesamtaler"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Viser status_meldinger for kontakter i kontaktlisten"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6423,54 +6328,54 @@ msgstr ""
 "Dersom valgt vil Gajim vise statusmelding tilhørende kontakter under "
 "kontaktnavnet i kontaktlistevinduet og i gruppesludringer"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 "Vis e_kstra informasjon om kontakter i kontaktlista (humør, aktivitet, …)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Sendte kontakter:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "i _gruppesamtaler"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Utveksling av kontaktlisteelement"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Skru på kontaktlistefiltrering"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6482,29 +6387,29 @@ msgstr ""
 "Dersom språk ikke er valgt ved høyreklikking i feltet, vil forvalgt "
 "språkvalg brukes for denne kontakten, eller gruppesamtalen."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "meldingsinnhold"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Vis formateringsliste"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Viser status_meldinger for kontakter i kontaktlisten"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6513,58 +6418,58 @@ msgstr ""
 "Hvis usant vil du ikke lenger kunne se statuslinjer i samtaler når en "
 "kontakt endrer status og/eller statusmelding."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Kunne ikke ta del i gruppesamtale"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Kunne ikke ta del i gruppesamtale"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Sludresnarveier"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Vis statusendringer"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Vis lukkingsknapp på fanen?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6573,64 +6478,67 @@ msgstr ""
 "Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
 "bruker"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Vis lukkingsknapp på fanen?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
+"bruker"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Siste tilstand"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Samtale"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Vis merknad i systemstatusfeltet (systray):"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Ved mottak av ny hendelse:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Tillat oppsprett/merknader når et sludrevindu åpnes"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Tillat oppspretts/merknader når jeg er _borte/ikke tilgjengelig/opptatt/"
 "usynlig"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6638,50 +6546,50 @@ msgid ""
 msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Visuelle merknader</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Be_handle…"
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Tillat lyd når jeg er _opptatt"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Lyd"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Merknader"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Ikke tilgjengelig"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6690,7 +6598,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6699,7 +6607,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6712,7 +6620,7 @@ msgstr ""
 "$S byttes ut av tidligere brukt statusmelding\n"
 "$T byttest ut av 'Automatisk-borte'-tidsavbrudd"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6725,40 +6633,40 @@ msgstr ""
 "$S vil byttes ut av forrige status melding\n"
 "$T vil byttes ut av automatisk 'Ikke-tilgjengelig'-tidsavbrudd"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutter"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatisk status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Spør etter statusmelding når jeg:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Logg _inn"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Logg _ut"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6766,68 +6674,68 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spørre etter statusmelding. Oppgitt forvalg for "
 "meldingen vil benyttes i steden for."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Forvalgt melding"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Påslått"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Statusmelding"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Forvalgt statusmelding</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Drakt"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Drakt"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Sett opp farge og skrift for grensesnittet"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Standard _miniatyrbildesamling:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Bruk _transportens miniatyrbilder"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6836,76 +6744,76 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra ICQ "
 "vil ha tilsvarende ICQ-ikon for pålogget stastus, borte, opptatt, osv…)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 #, fuzzy
 msgid "_Convert ASCII Emojis"
 msgstr "Skru på ASCII-smilefjes"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Stil"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Funksjonalitet"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Lydenhet for avspilling"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Lydenhet for mikrofon"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Lydtest"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Videotest"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Videokamera-enhet"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "videoutdata"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Bildetakt for video"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Videostørrelse"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 #, fuzzy
 msgid "Vi_ew own video source"
 msgstr "Vis egen videokilde"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "STUN-tjener:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -6914,53 +6822,63 @@ msgstr ""
 "STUN-tjenerens vertsnavn. Hvis ikke noe er oppgitt, vil Gajim\n"
 "prøve å lete opp ett fra tjeneren."
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Lyd / Video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 #, fuzzy
 msgid "_Global proxy"
 msgstr "Global mellomtjener:"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Behandle…"
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Loggfør statusendringer tilhørende kontakter"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 #, fuzzy
 msgid "Enable _debug logging (restart required)"
 msgstr "Skru på kontaktlistefiltrering"
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Diverse</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Åpne…"
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Avansert oppsettsbehandlder"
@@ -7139,12 +7057,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Skriv inn nytt passord:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Avanserte Handlinger"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Bruk egendefinert maskinnavn/port"
@@ -7231,7 +7149,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Logg _inn"
@@ -7245,7 +7163,7 @@ msgstr "Velg et kallenavn"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7275,8 +7193,8 @@ msgstr "_Tilbakestill til forvalg"
 msgid "Resets value to default"
 msgstr "_Tilbakestill til forvalg"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 msgid "Hostname"
 msgstr "Vertsnavn"
 
@@ -7317,7 +7235,7 @@ msgstr "Vis sertifikat…"
 msgid "Proxy Host"
 msgstr "_Vert for mellomtjener:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Skriv"
 
@@ -7331,8 +7249,7 @@ msgstr "_Protokoll:"
 msgid "Copy info to clipboard"
 msgstr "_Kopier lenke-plassering"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Funksjonalitet"
 
@@ -7519,6 +7436,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Endre statusmelding…"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humør:</b>"
@@ -7595,9 +7517,10 @@ msgid "Installed"
 msgstr "Innstallert"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "Tilleggets beskrivelse bør vises her. Denne teksten vil bli slettet under "
 "igangsetting av PluginsWindow."
@@ -7784,73 +7707,105 @@ msgstr "Sludresnarveier"
 msgid "_Name"
 msgstr "_Navn:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 msgid "Proxy"
 msgstr "Mellomtjener"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Start samtale"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Forlat gruppesamtaler"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Historikk-behandler"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Tillegg"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
-msgstr "Tilstedeværelse"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+msgid "_Preferences"
+msgstr "_Innstillinger"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "Avslutt"
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontoer"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
+#, fuzzy
+msgid "_View"
 msgstr "Vis"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Vis aktive kontakter"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
+#, fuzzy
+msgid "Show _Offline Contacts"
 msgstr "Vis _frakoblede kontakter"
 
 #: gajim/data/gui/application_menu.ui:50
-msgid "Show Active Contacts"
+#, fuzzy
+msgid "Show _Active Contacts"
 msgstr "Vis aktive kontakter"
 
 #: gajim/data/gui/application_menu.ui:54
-msgid "Show Transports"
+#, fuzzy
+msgid "Show _Transports"
 msgstr "Vis transporter"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML-konsoll"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Filoverføring"
+
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
+#, fuzzy
+msgid "_Help"
 msgstr "Hjelp"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Pålogget"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Pålogget"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Funksjonalitet"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7865,6 +7820,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Forlat gruppesamtaler"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8143,54 +8103,62 @@ msgstr "Sludresnarveier"
 msgid "Create new group chat"
 msgstr "Forlat gruppesamtaler"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Tilstedeværelse"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Tillegg"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 msgid "File transfers"
 msgstr "Filoverføringer"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr "Sett statusmelding"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Vis _XML-konsoll"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Utseende"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Vis _frakoblede kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 msgid "Show only active contacts"
 msgstr "Kun vis aktive kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 #, fuzzy
 msgid "Enable contact list filtering"
 msgstr "Skru på kontaktlistefiltrering"
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Kun vis aktive kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr "Gi kontakt nytt navn"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "Slett kontakt"
 
@@ -8266,12 +8234,16 @@ msgstr "Fyll inn skjemaet."
 msgid "Group Chat Configuration"
 msgstr "Invitasjon til gruppesamtale"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML-konsoll"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Start Samtale..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "Filter"
 
@@ -8314,10 +8286,6 @@ msgstr "Vis alle _handlinger på vent"
 msgid "Mute Sounds"
 msgstr "Slå av lyder"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-msgid "_Preferences"
-msgstr "_Innstillinger"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8655,124 +8623,124 @@ msgstr "%(received)s av %(max)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s har tatt del i gruppesamtalen"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Fremheving av gruppesamtale:"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Gruppesludringsstøtte"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Fremheving av gruppesamtale:"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Gruppesludringsstøtte"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Fremheving av gruppesamtale:"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Gruppesludringsstøtte"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Gruppesludringsstøtte"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Gruppesludringsstøtte"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Invitasjon til gruppesamtale"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Denne økta VIL bli arkivert på tjeneren"
@@ -8801,7 +8769,7 @@ msgid "Sender: %s"
 msgstr "Avsender: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -8955,7 +8923,7 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -8970,7 +8938,7 @@ msgid "Change"
 msgstr "Endre kallenavn"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Straks tilbake"
@@ -9001,11 +8969,12 @@ msgid "Password Change Failed"
 msgstr "Passord påkrevd"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Det skjedde en feil under oppretting av kontoen"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Endre passord"
 
@@ -9043,40 +9012,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Ukjent SSL-feil: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Start ny samtale"
+msgid "Start / Join Chat"
+msgstr "Start samtale"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppesamtale uten å være tilkoblet."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Ta del i gruppesamtale"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "Legg til kontakt…"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s ikke funnet"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke svart med detaljert informasjon"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9085,33 +9049,33 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er mest sannsynlig foreldet eller på en snurr."
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Andre"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste opp tilgjengelige tjenester"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter tjenester med %s-kontoen"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Se etter tjenester"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9119,141 +9083,141 @@ msgstr ""
 "Det er ingen tjenestetilbud på adressen du oppgav, eller den svarer ikke. "
 "Sjekk adressen og prøv igjen."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Ugyldig tjenernavn"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsker %(address)s med kontoen %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr "Utforsk"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholder ingen elementer å utforske."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Kommandoer: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Søk"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanner %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Brukere"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Node"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Ny post"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "tema"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkeltmelding ved bruk av kontoen %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkeltmelding i kontoen %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Enkeltmelding"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Mottatt %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Ulovlig tegn"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sjekk at du er tilkoblet \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Det er ikke mulig å sende en melding til %s, JID-en er ikke gyldig."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
@@ -9299,93 +9263,75 @@ msgstr "Registrert"
 msgid "Registration failed"
 msgstr "Registrering feilet"
 
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Ordliste for språket \"%s\" er ikke tilgjengelig"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Du må installere '%s'-ordbok for å bruke stavekontroll, eller velge et annet "
-"språk ved å sette speller_language -valget.\n"
-"\n"
-"Funksjonen for utheving av feilstavede ord vil ikke bli brukt"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Klientsertifikat"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "Sertifikat for kontoen %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG-nummer:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Invitasjon til gruppesamtale"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -9400,6 +9346,11 @@ msgstr "GG-nummer:"
 msgid "ICQ Number"
 msgstr "ICQ-nummer:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "Legg til kontakt…"
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9452,9 +9403,9 @@ msgid "Error while adding transport contact"
 msgstr "Feil ved tilføying av transportkontakt"
 
 #: gajim/gtk/add_contact.py:486
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9617,31 +9568,51 @@ msgstr "Kontakt Frakoblet"
 msgid "Contact Connected Background "
 msgstr "Kontakt tilkoblet"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Statusmelding"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Statusmelding"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Statusmelding"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Statusmelding"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Ugyldig kallenavn"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Ulovlig tegn"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Ønsker du å slette valgt melding?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9650,12 +9621,12 @@ msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne "
 "statusmeldingen?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Påslått"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Tillegg"
@@ -9679,10 +9650,9 @@ msgid "Error: %s"
 msgstr "Feil: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Feil"
 
@@ -9696,44 +9666,44 @@ msgstr "Statusen er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Statusen er nå: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "Åpne"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Alle filer"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 msgid "Clear File"
 msgstr "Tøm fil"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
 msgstr "Behandle mellomtjenere"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Mellomtjener"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 msgid "Adjust to Status"
 msgstr "Juster til status"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "På"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Av"
 
@@ -9753,7 +9723,7 @@ msgstr "Konto-rad"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9785,43 +9755,47 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Kontoen \"%s\" er tilkoblet tjeneren"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Synkroniser historikk"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Hvor langt tilbake ønsker du å gå?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "Én måned"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "Tre måneder"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Ett år"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "Alt"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "Kobler til…"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s av %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Lastet ned %s meldinger"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, fuzzy, python-format
 msgid ""
 "Finished synchronising chat history:\n"
@@ -9832,7 +9806,7 @@ msgstr ""
 "        {received} meldinger lastet ned.\n"
 "        "
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 #, fuzzy
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
@@ -9841,7 +9815,7 @@ msgstr ""
 "        med arkivet.\n"
 "        "
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 #, fuzzy
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
@@ -9851,7 +9825,7 @@ msgstr ""
 "        "
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "En GTK+ -XMPP-klient"
@@ -9907,122 +9881,122 @@ msgstr ""
 "Allan Nordhøy <epost@anotheragency.no>\n"
 "Stian B. Barmen <stian@barmen.nu>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr "Velg fil å sende…"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Velg arkiv"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Alle filer"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Alle filer"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Send filer"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Bilder"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Velg arkiv"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Zip-filer"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr "Lagre fil som…"
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "Åpne"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av denne gruppesamtalen"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Filnavn: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
 msgstr "?Noun:Nedlasting"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 msgid "?Noun:Upload"
 msgstr "?Noun:Opplasting"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Filoverføring stoppet"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:Pauset"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:Pauset"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:Pauset"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:Pauset"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:Pauset"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:Pauset"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Pauset"
@@ -10031,7 +10005,7 @@ msgstr "?transfer status:Pauset"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Ugyldig fil"
@@ -10086,25 +10060,25 @@ msgstr "Utheving av Gruppesamtale-melding"
 msgid "Group Chat Message Received"
 msgstr "Gruppesamtale-melding motatt"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Passord påkrevd"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "Ingen"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Avbryt"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10122,11 +10096,6 @@ msgstr "bruker kontoen %s"
 msgid "Hide _Contact List"
 msgstr "Inviter _kontakter"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Vis aktive kontakter"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Skjul denne menyen"
@@ -10169,35 +10138,30 @@ msgid ""
 "later."
 msgstr "Feil under publisering av personlig informasjon, prøv igjen senere."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Arkiveringsinnstillinger for %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Arkiveringsinnstillinger"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "Dine arkiveringsinnstillinger har blitt lagret."
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Fikk ikke noe svar fra tjeneren"
+msgid "Archiving Preferences Error"
+msgstr "Arkiveringsinnstillinger"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "Feil i mottatt: {}"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "Arkiveringsinnstillinger"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Påskrudd"
@@ -10246,48 +10210,48 @@ msgstr "?Ask (for Subscription):Ingen"
 msgid "?password:Hidden"
 msgstr "Passord:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s dager, %(hours)s timer"
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "Arkiveringsinnstillinger"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Lyd / Video"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Evne til å starte lyd- og video-samtaler."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 #, fuzzy
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
@@ -10296,34 +10260,34 @@ msgstr ""
 "Krever gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav og "
 "gstreamer1.0-plugins-ugly."
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Funksjonen er ikke tilgjengelig på Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr "Evnen til å måle uvirksom tid for å kunne sette auto-status."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Krever libxss-biblioteket."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10331,105 +10295,103 @@ msgid ""
 msgstr ""
 "Tjenerløs samtale med automatisk oppdagede klienter på lokalt nettverk."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Krever gir1.2-gupnpigd-1.0."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Krever at pybonjour og bonjour-SDK kjører (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Tilkoblingsvalg"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Krever Gspell"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Funksjonen er ikke tilgjengelig på Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Merknader"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Evne til å starte lyd- og video-samtaler."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Krever python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Lagre passord"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Passord kan lagres sikkert og ikke bare i klartekst."
 
-#: gajim/gtk/features.py:140
+#: gajim/gtk/features.py:129
 #, fuzzy
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
-"Krever libsecret og en tilbyder (som GNOME-nøkkelringen og KSecretService)."
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Krever gnome-keyring og python-gnome2-desktop, eller kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Stavekontroll"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Krever Gspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 #, fuzzy
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 "Evnen til å forespørre din ruter etter åpning av port for filoverføring."
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Krever gir1.2-gupnpigd-1.0."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Arkiveringsinnstillinger"
@@ -10476,7 +10438,7 @@ msgstr "Listenavnet er ugyldig"
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive inn et navn for å lage en personvernsliste."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Inviter _kontakter"
@@ -10504,7 +10466,7 @@ msgstr "_Avslutt"
 msgid "Commands"
 msgstr "Kommandoer: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10575,120 +10537,134 @@ msgstr "Abonneringsønske fra %s"
 msgid "Loading"
 msgstr "Laster"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Tilkoblet"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Logg på"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Fjerner kontoen %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Klikk for å endre kontoens passord"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Kobler til…"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Din server støtter ikke Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Ulovlig tegn"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Din server støtter ikke Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Tilkobling mislyktes"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Kontoen \"%s\" er tilkoblet tjeneren"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "Legg til kontakt…"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Lag en ny post"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Egendefinert port må være et portnummer"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "Ressursen må være mellom 1 og 1023 byte"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Avanserte Handlinger"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Advarsel: %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Ukjent SSL-feil: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Fjerner kontoen %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registrer til %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Konto-rad"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Kontoer"
@@ -10731,234 +10707,238 @@ msgstr "Søk"
 msgid "No results found"
 msgstr "Inget resultat"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Forvalg"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "status-meldingstittel"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "statusmeldings-tekst"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Innlogging"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Logge inn på nytt nå?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Dersom du ønsker at endringene skal trå i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 #, fuzzy
 msgid "_Re-Login"
 msgstr "Innlogging"
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Sjekk om Avahi eller Bonjour er installert."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Sjekk om Avahi eller Bonjour er installert."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Ugyldig konto"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Kontoen \"%s\" er tilkoblet tjeneren"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Ugyldig konto"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr "Innlogging"
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "Importer kontakter"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-msgid "Client Certificate"
-msgstr "Klientsertifikat"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 msgid "Connect on startup"
 msgstr "Koble til ved oppstart"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 msgid "Save conversations for all contacts"
 msgstr "Lagre alle samtaler ført med kontakter"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr "Lagre samtaler på harddisken"
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 msgid "Global Status"
 msgstr "Global status"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 msgid "Synchronise the status of all accounts"
 msgstr "Synkroniser statusen for alle kontoer"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Bruk filoverførings-mellomtjenere"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Uvirksom siden:"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Klientsertifikat"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "Tillat Gajim å sende informasjon om hvilket operativsystem du bruker."
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Inviter _kontakter"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr "Sett vertsnavnet for tjeneren manuelt"
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr "Prioritet"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 msgid "Use environment variable"
 msgstr "Bruk miljøvariabel"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 msgid "Synchronize the status of all accounts"
 msgstr "Synkroniser statusen for alle kontoer"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 msgid "First Name"
 msgstr "Fornavn"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 msgid "Last Name"
 msgstr "Etternavn"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 msgid "Email"
 msgstr "E-post"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 msgid "Adjust to status"
 msgstr "Juster til status"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Slå på"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 msgid "Port"
 msgstr "Port"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Tilkoblingsvalg"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+msgid "Client Certificate"
+msgstr "Klientsertifikat"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PCKS12-filer"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 msgid "Encrypted Certificate"
 msgstr "Kryptert sertifikat"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Sertifikatsvalg"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 msgid "Save Password"
 msgstr "Lagre passord"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Tillegg"
@@ -11013,19 +10993,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Fjernet %d kontakt"
 msgstr[1] "Fjernet %d kontakter"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Ukjent artist"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Ukjent tittel"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Ukjent kilde"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11039,20 +11019,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Bokmerker"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Arkiv skadet"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "Arkiv tomt"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "Arkivet er skadet"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Programtillegget finnes allerede"
@@ -11107,125 +11087,261 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Vis alle _handlinger på vent"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 msgid "Features:"
 msgstr "Funksjonalitet:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Stavekontroll av skrevne meldinger."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 #, fuzzy
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr "Link-local (bonjour / zeroconf), BOSH"
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Tjenesteoppdagelse med noder, brukersøk"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 #, fuzzy
 msgid "Even more features via plugins"
 msgstr "Andre funksjoner via programtillegg"
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontakter"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr "Fanebasert sludrevindu"
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 msgid "Group chat support"
 msgstr "Gruppesludringsstøtte"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Chat history"
 msgstr "Sludrehistorikk"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 msgid "Plugin manager"
 msgstr "Programtilleggsbehandler"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Start ny samtale"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Ukjent SSL-feil: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "Krever libsecret og en tilbyder (som GNOME-nøkkelringen og "
+#~ "KSecretService)."
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Velg intervall mellom to uvirksomhetssjekker."
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Ordliste for språket \"%s\" er ikke tilgjengelig"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Du må installere '%s'-ordbok for å bruke stavekontroll, eller velge et "
+#~ "annet språk ved å sette speller_language -valget.\n"
+#~ "\n"
+#~ "Funksjonen for utheving av feilstavede ord vil ikke bli brukt"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Koble til på ny"
+
+#~ msgid "Quit"
+#~ msgstr "Avslutt"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Vis aktive kontakter"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "Legg til kontakt…"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Inviter _kontakter"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Forlat gruppesamtaler"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Ny gruppesamtale"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Hvis sant vil Gajim vise et miniatyrbilde på hver fane som inneholder "
+#~ "uleste meldinger. Avhengig av valgt tema kan dette være animert."
+
+#, fuzzy
+#~ msgid "Show a mini avatar in chat window tabs and as the window's icon."
+#~ msgstr "Vis en miniavatar i sludrevindusfaner og i vindusikonet"
+
+#, fuzzy
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "Vis avatar i sludrefaner"
+
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Tjeneren må være mellom 1 og 1023 byte"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Ugyldig tegn i vertsnavn."
+
+#~ msgid "Server address required."
+#~ msgstr "Tjener-adresse kreves."
+
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Brukernavnet må være mellom 1 og 1023 byte"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Ugyldig tegn i brukernavn."
+
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "Ressursen må være mellom 1 og 1023 byte"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Ugyldig tegn i ressurs."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Varsle meg om kontakter som logger _inn"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Varsle meg om kontakter som logger _ut"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Ny meldingsmerknadsfarge."
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Gi meg beskjed når ei filoverføring er fullført"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Gi meg beskjed når ei filoverføring er fullført"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på"
+
+#~ msgid "Event Type"
+#~ msgstr "Hendelsestype"
+
+#~ msgid "Event desc"
+#~ msgstr "Hendelsesbeskrivelse"
+
+#, fuzzy
+#~ msgid "HTTP File Upload: Enable HTTPS Verification."
+#~ msgstr "HTTP-opplasting: Skru på HTTPS-bekrefting"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Fikk ikke noe svar fra tjeneren"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Ressurskonflikt"
 
@@ -11894,9 +12010,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Send privat melding"
 
-#~ msgid "Send _File"
-#~ msgstr "Send _fil"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Deltakere"
@@ -14823,9 +14936,6 @@ msgstr "Programtilleggsbehandler"
 #~ "oppsett kan du velge en annen her.\n"
 #~ "Du kan også vurdere å endre mulige brannmursinnstillinger."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Sammenslåin_g av kontoer"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP er ikke brukbart på denne maskinen"
 
@@ -15289,9 +15399,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Krever python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Krever gnome-keyring og python-gnome2-desktop, eller kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/nl.po b/po/nl.po
index 38c225990..67f6365d0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2015-04-24 00:10+0100\n"
 "Last-Translator: Nathan Follens <nthn@unseen.is>\n"
 "Language-Team: none\n"
@@ -20,73 +20,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Accounts"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "en geauthenticeerd"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "en NIET geauthenticeerd"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s-versleuteling is actief %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Kies afbeelding"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Je staat op het punt meerdere tabbladen te sluiten"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Weet je zeker dat je het groepsgesprek ‘%s’ wil verlaten?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "Vraag mij _dit niet nogmaals"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "Privacy"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 "Als je een bestand naar <b>%s</b> stuurt zal hij/zij je echte JID zien."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Doorgaan"
 
@@ -150,461 +156,466 @@ msgstr "Er is geen lopend abonneringsverzoek."
 msgid " resource with priority "
 msgstr " bron met prioriteit "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Offline contacten weergeven"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Ik wil je graag toevoegen aan mijn contacten."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Enkel _bericht verzenden…"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "Opdra_cht uitvoeren…"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "Transport _beheren"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "Transport b_ewerken"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "_Hernoemen…"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Deblokkeren"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokkeren"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Verwijderen"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informatie"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Bestand verzenden…"
+#: gajim/gui_menu_builder.py:517
+#, fuzzy
+msgid "Send File"
+msgstr "_Bestand Verzenden"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
 msgstr "Bestand uploaden…"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr "Bestand rechtstreeks verzenden…"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 msgid "Send Chatstate"
 msgstr "Chatstatus verzenden"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+#, fuzzy
+msgid "Invite Contacts…"
 msgstr "Contacten uitnodigen"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
-msgstr "Contact toevoegen"
+msgid "Add to Contact List…"
+msgstr "Contact toevoegen…"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Audiogespreksverzoek"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Videotest"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "Informatie"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "Geschiedenis"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Alleen ‘aan het typen’"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Alle gesprekstoestanden"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Contacten uitnodigen"
+msgid "All Chat States"
+msgstr "Alle gesprekstoestanden"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Groepsgesprekken verlaten"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Groepsgesprekken verlaten"
-
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
-msgstr "Onderwerp veranderen"
+msgid "Rename…"
+msgstr "_Hernoemen…"
 
-#: gajim/gui_menu_builder.py:579
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Configure Group Chat"
-msgstr "Groepsgesprekken verlaten"
+msgid "Change Subject…"
+msgstr "Onderwerp veranderen"
 
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "Avatar uploaden…"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Nieuw groepsgesprek"
+msgid "Configure…"
+msgstr "Configureren"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "%s vernietigen"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 msgid "Chat Settings"
 msgstr "Gespreksinstellingen"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+#, fuzzy
+msgid "Show Join/Leave"
 msgstr "Berichten over deelnemen/verlaten tonen"
 
-#: gajim/gui_menu_builder.py:585
-msgid "Show status changes"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Show Status Changes"
 msgstr "Statusveranderingen tonen"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
+#: gajim/gui_menu_builder.py:584
+#, fuzzy
+msgid "Notify on all Messages"
 msgstr "Melding bij alle berichten"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Minimize on Close"
 msgstr "Minimaliseren bij sluiten"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Minimaliseren bij automatisch deelnemen"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "Drempelwaarde voor synchronisatie"
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Bij_naam veranderen…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "Stem aanvragen"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "Opdracht uitvoeren"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+#, fuzzy
+msgid "Execute Command…"
+msgstr "Opdra_cht uitvoeren…"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "Geen drempelwaarde"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dag"
 msgstr[1] "%i dagen"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Alleen ‘aan het typen’"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Alle gesprekstoestanden"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
 msgstr "Contact toevoegen…"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Profiel"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "Enkel bericht verzenden…"
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
 msgstr "Diensten ontdekken"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "Serverinfo"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "Archiefvoorkeuren"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 msgid "Blocking List"
 msgstr "Blokkeringslijst"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Configuratie"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "Synchronise History…"
 msgstr "Geschiedenis synchroniseren"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Privacylijsten"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 msgid "Send Server Message…"
 msgstr "Serverbericht verzenden…"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 msgid "Set MOTD…"
 msgstr "MOTD instellen…"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr "MOTD bijwerken…"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 msgid "Delete MOTD…"
 msgstr "MOTD verwijderen…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "Account toevoegen…"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Account Be_werken..."
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Account Be_werken..."
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Accounts"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "E-mailadres kopiëren"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
 msgstr "Deelnemen aan groepsgesprek"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Gesprek beginnen"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "Contact toevoegen…"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
 msgstr "Verwijzingslocatie kopiëren"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 msgid "Open Link in Browser"
 msgstr "Verwijzing openen in browser"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
 msgstr "E-mailadres kopiëren"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 msgid "Open Email Composer"
 msgstr "E-mailopsteller openen"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "Verwijzingslocatie kopiëren"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Locatie:"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "E-mailadres kopiëren"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Uit_nodigen"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Deblokkeren"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Blokkeren"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "Uit_schoppen"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "Ver_bannen"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Eigenaar"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Lid"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Lid"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "Stem aanvragen"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "JID kopiëren"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Opties:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Dit hulpbericht weergeven en afsluiten"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Kies map voor logboekbestand"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Kan logboekdatabase niet vinden"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Bestand bestaat niet"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM-adres:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -612,28 +623,28 @@ msgstr "Datum"
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Bericht"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Database opschonen"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "cachedatabase wordt aangemaakt"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -646,189 +657,189 @@ msgstr ""
 "\n"
 "Als je op JA klikt, even geduld…"
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Ruim _op"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Jij"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s zei op %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Gesprek verwijderen"
 msgstr[1] "Gesprekken verwijderen"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Wil je dit gesprek met <b>%s</b> voorgoed verwijderen"
 msgstr[1] "Wil je deze gesprekken voorgoed verwijderen"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Bericht verwijderen"
 msgstr[1] "Berichten verwijderen"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Wil je dit bericht voorgoed verwijderen"
 msgstr[1] "Wil je deze berichten voorgoed verwijderen"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contactnaam: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Algemeen"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Groep"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "In de groep"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Stemming instellen"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Geen"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s statusbericht"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 #, fuzzy
 msgid "Overwrite"
 msgstr "Overschrijven?"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Statusbericht overschrijven?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Deze naam is al in gebruik. Wil je dit statusbericht overschrijven?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Overschrijven?"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Statusbericht"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Opslaan als voorinstelling…"
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Geef een nieuwe naam in voor dit statusbericht"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Opslaan _als"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Zonder verbinding is het niet mogelijk je contacten te synchroniseren."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Naam"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Deze account is niet verbonden met de server"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Het is niet mogelijk met een account te synchroniseren zonder dat deze "
 "verbonden is."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synchroniseren"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "een audio- en video-"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "een audio-"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "een video-"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -837,94 +848,98 @@ msgstr ""
 "%(contact)s wil een %(type)s sessie met je beginnen. Wil je de oproep "
 "beantwoorden?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Bestand verzenden…"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Bestand opslaan als…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 msgid "No File Transfer available"
 msgstr "Geen bestandsoverdracht beschikbaar"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Ongeldig knooppunt"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Kon afbeelding niet laden"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Banlijst"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Bijnaam invoeren"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Audiogespreksverzoek"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 #, fuzzy
 msgid "_Approve"
 msgstr "approve"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s heeft het onderwerp ingesteld als %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Groepsgesprek toont nu niet beschikbare leden"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Groepsgesprek verbergt nu niet-beschikbare leden"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr "Een instelling is gewijzigd, niet gerelateerd aan privacy"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Deze sessie ZAL gearchiveerd worden op de server"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informatie over jou, zoals op de server opgeslagen"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Groepsgesprek is nu niet-anoniem"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Groepsgesprek is nu semi-anoniem"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Groepsgesprek is nu volledig anoniem"
@@ -939,7 +954,7 @@ msgstr "Ping? (%s)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Fout."
 
@@ -968,22 +983,22 @@ msgstr "Een nieuw groepsgesprek is aangemaakt"
 msgid "Failed to Configure Group Chat"
 msgstr "Groepsgesprekken verlaten"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} is nu bekend als {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Je bent nu {show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} is nu {show}{status}"
@@ -1109,79 +1124,79 @@ msgid "If you close this window, you will leave '%s'."
 msgstr ""
 "Als je dit venster sluit zal de verbinding verbroken worden met deze ruimten."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s is in dit groepsgesprek uitgenodigd"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Toon een lijst van opmaakstijlen"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Dit contact ondersteunt geen HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s seconden)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s toestand : %(state)s, reden: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s van groepsgesprek %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Versleuteling wordt gebruikt voor dit contact."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Je hebt zonet een nieuw bericht ontvangen van %s"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 msgid "Close"
 msgstr "Sluiten"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nieuw bericht"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr "S_luiten"
 
 # .
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1190,175 +1205,166 @@ msgstr ""
 "Onderwerp: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s is nu %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "Bestandsoverdracht"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Grootte"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 msgid "_Accept"
 msgstr "_Accepteren"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "_Weigeren"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht voltooid"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Bovenliggende map openen"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 msgid "Group Chat Invitation"
 msgstr "Uitnodiging voor groepsgesprek"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Contact heeft de overdracht gestopt"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Fout bij openen van bestand"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Bestandsoverdracht gestopt"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Bestandsoverdracht geannuleerd"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Kon geen verbinding maken met gebruiker."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr "Toepassingsversie weergeven"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "Alleen kritieke fouten weergeven"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 "Profielbestanden volledig scheiden (zelfs geschiedenisdatabase en plug-ins)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr "XML-stanza’s en andere debuginformatie afdrukken"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Gebruik opgegeven profiel in configuratiemap"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Configuratiemap instellen"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Logboeksysteem configureren"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "Alle waarschuwingen weergeven"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "IPython-shell openen"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Toont een venster met de volgende lopende gebeurtenis"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Nieuw gesprek beginnen"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "Verbroken verbinding simuleren"
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "Herstellen van verbinding simuleren"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Databasefout"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transporten"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Groepsgesprekken"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr "Machtiging verzonden"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "‘%s’ zal nu je status zien."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Als ‘%s’ dit verzoek accepteert zal je zijn/haar status kunnen ontvangen."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
 msgstr "Machtiging verwijderd"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "‘%s’ zal je nu altijd als offline zien."
@@ -1367,7 +1373,7 @@ msgstr "‘%s’ zal je nu altijd als offline zien."
 msgid "desynced"
 msgstr "gedesynchroniseerd"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr "Gajim afsluiten"
 
@@ -1386,7 +1392,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Gajim altijd sluiten"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Afsluiten"
 
@@ -1543,8 +1550,8 @@ msgstr "Groep hernoemen"
 msgid "Please enter a new name"
 msgstr "Maak een mooi nieuw thema."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Her_noemen"
@@ -1563,28 +1570,33 @@ msgstr "Wil je groep %s zeker uit het rooster verwijderen?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Verwijder ook alle contacten in deze groep van je rooster"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Groepsgesprekken verlaten"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Voer een nieuwe gebruikersnaam in voor je lokale account"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Contact hernoemen"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Verwijdert contact van rooster"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr ""
 "Je staat op het punt ‘%(name)s’ (%(jid)s) uit je rooster te verwijderen.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1593,20 +1605,20 @@ msgstr ""
 "Door dit contact te verwijderen zal je ook zijn/haar toestemming opzeggen om "
 "je status te zien, en zal hij/zij je altijd als offline zien."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Wil je doorgaan?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr "IIk wil dat dit contact na verwijdering mijn status kan blijven zien"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Verwijdert contact van rooster"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1617,26 +1629,26 @@ msgstr ""
 "Door dit contact te verwijderen zal je ook zijn/haar toestemming opzeggen om "
 "je status te zien, en zal hij/zij je altijd als offline zien."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Contact hernoemen"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontactenopslag wordt niet ondersteund door je server"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1645,12 +1657,12 @@ msgstr ""
 "metacontacteninformatie, deze informatie zal dus niet opgeslagen worden bij "
 "de volgende verbinding."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Je staat op het punt een metacontact aan te maken. Weet je het zeker?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1661,120 +1673,120 @@ msgstr ""
 "hergroeperen. Het wordt meestal gebruikt wanneer dezelfde persoon meerdere "
 "XMPP- of transportaccounts heeft."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Contact hernoemen"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Creatief"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Ongeldige bestands-URI:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Wil je dit bestand sturen naar %s:"
 msgstr[1] "Wil je deze bestanden sturen naar %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "Ver_zenden"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Stuur %(from)s naar %(to)s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s instellen als hoofdcontact"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%(contact1)s en %(contact2)s instellen als metacontacten"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Wijzig statusbericht"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Deuntje publiceren"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Locatie publiceren"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "Alles _maximaliseren"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Groepsb_ericht versturen"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Aan alle gebruikers"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Aan alle beschikbare gebruikers"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Uitnodigen voor"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "Contacten _beheren"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "_Groepen bewerken…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maximaliseren"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Her_noemen"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "Opnieuw ve_rbinden"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "Opdracht uitvoeren"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Geschiedenisbeheer"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Waarnemers"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1900,70 +1912,70 @@ msgstr "Privégesprekken"
 msgid "Messages"
 msgstr "Berichten"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s)-machtiging voor %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Accepteer je dit verzoek?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Accepteer je dit verzoek op account %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Machtiging verzonden"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Machtiging verzonden"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Nee"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Verbinding mislukt"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout bij versturen van %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Contact ‘%s’ heeft je toestemming gegeven zijn/haar status te zien."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Abonneringsverzoek"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Contact ‘%s’ heeft het abonnement op jou opgezegd"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -1972,147 +1984,147 @@ msgstr ""
 "Je zal hem of haar altijd als offline zien.\n"
 "Wil je hem of haar uit je contacten verwijderen?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Abonnement opgezegd"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s heeft de uitnodiging geweigerd: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s heeft de uitnodiging geweigerd"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Je bent door {user} uitgenodigd in {room}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "Certificaatwachtwoord vereist"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Voer het wachtwoord in van het certificaat voor account %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Voer je wachtwoord voor account %s in"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Wachtwoord vereist"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Wachtwoord opslaan"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Fout bij bestandsoverdracht"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Verzoek voor bestandsoverdracht"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Contact heeft de overdracht gestopt"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Fout bij openen van bestand"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL-certificaatfout"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht gestopt"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Bestandsoverdracht mislukt"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s ontvangen van %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s mislukt."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Je hebt %(filename)s naar %(name)s gestuurd."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s mislukt."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Gebruikersnaamconflict"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Voer een nieuwe gebruikersnaam in voor je lokale account"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Oké"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wil een audiogesprek starten."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Audiogespreksverzoek"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Onveilige verbinding"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2124,21 +2136,21 @@ msgstr ""
 "onversleuteld worden verstuurd. Dit soort verbinding wordt sterk afgeraden.\n"
 "Ben je zeker dat je wil doorgaan?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 #, fuzzy
 msgid "_Abort"
 msgstr "Afgebroken"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Bezig met verbinden"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2341,11 +2353,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Uploaden van avatar is mislukt"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Sturen van privébericht mislukt"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2683,77 +2695,72 @@ msgstr ""
 "Parameter ‘%(arg)s’ is niet gespecificeerd. \n"
 "Voer ‘%(basename)s help %(command)s’ in voor meer informatie"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is een map maar zou een bestand moeten zijn"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, python-format
 msgid "Creating %s"
 msgstr "%s aanmaken"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Onbekende SSL-fout: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nieuw privébericht"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Nieuw bericht van %(nickname)s"
 msgstr[1] "%(n_msgs)i ongelezen berichten van %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 msgid "New Group Chat Message"
 msgstr "Nieuw bericht in groepsgesprek"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s wijzigde zijn/haar status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Contact heeft zijn/haar status gewijzigd"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s is ingelogd"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contact is ingelogd"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s is uitgelogd"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contact is uitgelogd"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Authenticatie met ‘%s’ mislukt"
@@ -2831,65 +2838,23 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Geef mij bericht over contacten die _inloggen"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Geef mij bericht over contacten die uitl_oggen"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Meldingskleur voor nieuw bericht."
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Achtergrondkleur statuswijzigingsmelding"
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Lijst (door spaties gescheiden) van rijen (accounts en groepen) die "
 "ingevouwen zijn."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "standaard"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Taal gebruikt door spellingscontrole"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2899,16 +2864,16 @@ msgstr ""
 "‘sometimes’ - toon tijd elke print_ichat_every_foo_minutes minuut/minuten.\n"
 "‘never’ - toon tijd nooit."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 "Indien ingeschakeld worden ASCII-emoji’s omgezet naar grafische emoji’s."
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandel koppels * / _ als mogelijke formatteringstekens."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2917,7 +2882,7 @@ msgstr ""
 "Indien ingeschakeld worden */_ niet verwijderd, zodat *abc* vetgedrukt "
 "wordt, maar zonder dat * * verwijderd wordt."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2926,7 +2891,7 @@ msgstr ""
 "Teken om achter bijnaam in te voegen bij gebruik van bijnaamaanvulling (tab) "
 "in groepsgesprekken."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2935,7 +2900,7 @@ msgstr ""
 "Voor te stellen teken om aan gewenste bijnaam toe te voegen indien gewenste "
 "bijnaam reeds door iemand anders in groepsgesprek in gebruik is."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 #, fuzzy
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
@@ -2944,12 +2909,12 @@ msgstr ""
 "Indien ingeschakeld zal Gajim de positie van het rooster onthouden bij "
 "verbergen, en deze herstellen wanneer het rooster weer wordt weergegeven."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 #, fuzzy
 msgid "Place the contact list on the right in single window mode"
 msgstr "Plaats het rooster rechts in de modus ‘Enkel venster voor alles’"
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2962,24 +2927,24 @@ msgstr ""
 "documentatie betreffende strftime voor volledige documentatie: http://docs."
 "python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Tekens die voor de bijnaam in gesprekken worden afgedrukt"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Tekens die na de bijnaam in gesprekken worden afgedrukt"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Indien aangevinkt zal Gajim de stemming van contacten in het roostervenster "
 "laten zien"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -2988,7 +2953,7 @@ msgstr ""
 "Hoeveel regels van het vorige gesprek moeten worden weergegeven in een nieuw "
 "gesprekstabblad of -venster?"
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 #, fuzzy
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
@@ -2996,7 +2961,7 @@ msgstr ""
 "Hoe ver terug in te de tijd (in minuten) geschiedenis wordt hersteld. -1 "
 "betekent geen limiet."
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3006,19 +2971,19 @@ msgstr ""
 "een groepsgesprek waarmee je verbinding verbroken wordt. Stel dit in op 0 om "
 "automatisch opnieuw deelnemen uit te schakelen."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Ctrl+Enter stuurt bericht, enkel Enter maakt een nieuwe regel "
 "(standaardgedrag van Mirabilis ICQ)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3027,11 +2992,11 @@ msgstr ""
 "Ofwel een aangepaste URL met %%s erin verwerkt, waar %%s een woord/zin is, "
 "ofwel ‘WIKTIONARY’, wat betekent dat Wiktionary gebruikt zal worden."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Indien aangevinkt zal Gajim bestuurd kunnen worden met gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3040,16 +3005,16 @@ msgstr ""
 "Wanneer de tijdstempel niet voor elk bericht wordt weergegeven "
 "(print_time==sometimes), geef ze dan elke x minuten weer."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3059,7 +3024,7 @@ msgstr ""
 "mogelijk gegevens verloren zouden gaan (in gesprekken, privégesprekken en "
 "groepsgesprekken die niet geminimaliseerd worden)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3069,31 +3034,31 @@ msgstr ""
 "interfaces, voor bestandsoverdrachten in het geval van adresvertaling of "
 "port forwarding."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Volgens de IEC standaard is 1 KiB = 1024 bytes, 1 KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Meldingen van gebeurtenissen weergeven in het systeemvak."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Notebookrand met tabbladen tonen in gespreksvensters?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Nieuwe berichten in meldingspop-up weergeven?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3102,7 +3067,7 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die gemarkeerd worden in een "
 "groepsgesprek."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3112,7 +3077,7 @@ msgstr ""
 "Indien ingeschakeld stopt Gajim zodra het venster gesloten wordt. Deze "
 "instelling is alleen geldig als het systeemvakpictogram gebruikt wordt."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 #, fuzzy
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
@@ -3121,17 +3086,7 @@ msgstr ""
 "Indien ingeschakeld verbergt Gajim het roostervenster wanneer dit wordt "
 "gesloten, in plaats van te minimaliseren naar het Dock."
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Indien ingeschakeld zal Gajim een pictogram met ongelezen berichten op elk "
-"tabblad weergeven. Afhankelijk van het thema kan dit pictogram geanimeerd "
-"zijn."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3140,13 +3095,13 @@ msgstr ""
 "Indien ingeschakeld zal Gajim het statusbericht van contacten weergeven "
 "onder hun naam in het roostervenster."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Bepaal de positie van avatars in het rooster, kan links of rechts zijn"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3155,7 +3110,7 @@ msgstr ""
 "Indien uitgeschakeld zullen geen statusberichten worden weergegeven in "
 "gesprekken wanneer een contact zijn/haar status en/of statusbericht aanpast."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
@@ -3164,7 +3119,7 @@ msgstr ""
 "Standaardinstelling: toon een statusbericht voor alle deelnemen/verlaten in "
 "een groepsgesprek"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
@@ -3173,12 +3128,12 @@ msgstr ""
 "Standaardinstelling: toon een statusbericht voor alle statuswijzigingen "
 "(afwezig, dnd, enz.) van gebruikers in een groepsgesprek"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Rooster niet weergeven in systeemvak."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3187,7 +3142,7 @@ msgstr ""
 "Indien ingeschakeld flikkert het venster (standaardgedrag bij de meeste "
 "vensterbeheerders) wanneer er lopende gebeurtenissen zijn."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3208,7 +3163,7 @@ msgstr ""
 "‘pertype’ - elk berichttype (bv. gesprekken of groepsgesprekken) krijgt een "
 "eigen berichtvenster."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3221,35 +3176,35 @@ msgstr ""
 "‘never’ - Rooster nooit weergeven.\n"
 "‘last_state’ - Laaste toestand van rooster herstellen."
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Indien uitgeschakeld zal je de avatar niet meer zien in het gespreksvenster."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Indien ingeschakeld kan de Escape-toets gebruikt worden om een tabblad/"
 "venster te sluiten."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Verbergt de banner in een groepsgespreksvenster"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Verbergt de banner in een groepsgespreksvenster"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Verbergt de lijst met deelnemers in een groepsgespreksvenster."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3258,11 +3213,11 @@ msgstr ""
 "Geef in een gesprek enkel de bijnaam weer aan het begin van een regel "
 "wanneer het niet dezelfde persoon is als in het vorige bericht."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Inspringwaarde bij samenvoegen van opeenvolgende bijnaam."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3271,7 +3226,7 @@ msgstr ""
 "Ctrl-Tab gaat naar het volgende opsteltabblad wanneer er geen ongelezen "
 "berichten zijn."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3280,7 +3235,7 @@ msgstr ""
 "Moet de dialoog voor het bevestigen van het blokkeren van een contact worden "
 "getoond? Een lege tekenreeks betekent dat de dialoog nooit wordt getoond."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3289,7 +3244,7 @@ msgstr ""
 "Moet de dialoog voor het bevestigen van het blokkeren van een contact worden "
 "getoond? Een lege tekenreeks betekent dat de dialoog nooit wordt getoond."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3300,7 +3255,7 @@ msgstr ""
 "account. LET OP, wanneer je ingelogd bent met een negatieve prioriteit zal "
 "je GEEN ENKEL bericht van je server ontvangen."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3309,7 +3264,7 @@ msgstr ""
 "Indien ingeschakeld zal Gajim het aantal online en het totale aantal "
 "contacten weergeven in account- en groeprijen."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3318,13 +3273,13 @@ msgstr ""
 "Indien ingeschakeld zal Gajim het contact selecteren dat je het laatst een "
 "bericht heeft gestuurd, als het gespreksvenster nog niet geopend is."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Duur van gebrek aan activiteit vooraleer venster voor wijzigen van status "
 "sluit."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3332,11 +3287,7 @@ msgstr ""
 "Maximum aantal regels die weergegeven worden in gesprekken. Oudere regels "
 "worden gewist."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Kies interval tussen 2 controles van inactiviteit."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3345,7 +3296,7 @@ msgstr ""
 "Geldige URI-schema’s. Enkel schema’s in deze lijst worden geaccepteerd als "
 "‘echte’ URI. (mailto en xmpp worden apart behandeld)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3353,23 +3304,23 @@ msgstr ""
 "Indien ingeschakeld werkt aanvulling in groepsgesprekken als shell-auto-"
 "aanvulling"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Mogelijke oplossing voor uitgaande videoframerate van Jingle. Bijvoorbeeld: "
 "10/1 of 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Jingle-video-uitvoer optioneel schalen. Bijvoorbeeld: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3379,11 +3330,11 @@ msgstr ""
 "van Jingle, ofwel die in de optie ‘stun_server’, ofwel die gegeven door de "
 "XMPP-server."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr "Te gebruiken STUN-server bij gebruik van Jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3392,7 +3343,7 @@ msgstr ""
 "Indien ingeschakeld zal Gajim de aansluiting van leden van groepsgesprekken "
 "weergeven door een gekleurd vierkantje toe te voegen aan het statussymbool"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
@@ -3401,13 +3352,13 @@ msgstr ""
 "Proxy gebruikt voor alle uitgaande verbindingen, als de account geen "
 "specifieke proxy heeft ingesteld"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 #, fuzzy
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 "Indien ingeschakeld zal Gajim inkomende aandachtsverzoeken negeren (‘wizz’)."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3415,7 +3366,7 @@ msgstr ""
 "Indien ingeschakeld zal Gajim de geopende gespreksvensters voor het laatste "
 "afsluiten van Gajim opnieuw openen."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3424,13 +3375,7 @@ msgstr ""
 "Indien ingeschakeld zal Gajim een pictogram weergeven om te tonen dat een "
 "verzonden bericht ontvangen is door je contact"
 
-#: gajim/common/config.py:256
-#, fuzzy
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-"Toon een mini-avatar en gespreksvenstertabbladen en in vensterpictogram"
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3438,22 +3383,22 @@ msgstr ""
 "Indien ingeschakeld zal Gajim de sleutelbos van het systeem gebruiken om "
 "accountwachtwoorden op te slaan."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 #, fuzzy
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Indien ingeschakeld zal Gajim XEP-0146-opdrachten uitvoeren."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: Systeem, 1: ingeschakeld, 0: uitgeschakeld"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 "Opties in dagen die gekozen kunnen worden in het "
 "synchronisatiedrempelwaardemenu"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 #, fuzzy
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
@@ -3462,7 +3407,7 @@ msgstr ""
 "Maximale geschiedenis in dagen die we van een openbaar groepsgespreksarchief "
 "opvragen. 0: zo veel mogelijk"
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 #, fuzzy
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
@@ -3471,13 +3416,13 @@ msgstr ""
 "Maximale geschiedenis in dagen die we van een privégroepsgespreksarchief "
 "opvragen. 0: zo veel mogelijk"
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3486,7 +3431,7 @@ msgstr ""
 "Of de contactrij gekleurd moet worden naargelang de huidige chatstatus van "
 "het contact"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3495,7 +3440,7 @@ msgstr ""
 "Of het tabblad gekleurd moet worden naargelang de huidige chatstatus van het "
 "contact"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3503,7 +3448,7 @@ msgid ""
 msgstr ""
 "Toon tekst in de banier die de huidige chatstatus van het contact beschrijft"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3513,7 +3458,7 @@ msgstr ""
 "Mogelijke waarden: all (alle), composing_only (alleen ‘aan het typen’), "
 "disabled (uitgeschakeld)"
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3523,30 +3468,34 @@ msgstr ""
 "Mogelijke waarden: all (alle), composing_only (alleen ‘aan het typen’), "
 "disabled (uitgeschakeld)"
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 #, fuzzy
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr "Indien ingeschakeld zal Gajim XEP-0146-opdrachten uitvoeren."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 #, fuzzy
 msgid "Width of group chat roster in pixel"
 msgstr "Nodig vrienden uit in groepsgesprekken, of neem eraan deel"
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Bladwijzernaam"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3555,7 +3504,7 @@ msgstr ""
 "Prioriteit zal automatisch veranderen naargelang je status. Prioriteiten "
 "worden gedefinieerd in de autopriority_*-opties."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3566,12 +3515,12 @@ msgstr ""
 "‘away’, ‘xa’, ‘dnd’ of ‘invisible’ zijn. LET OP: deze optie wordt enkel "
 "gebruikt als restore_last_status is uitgeschakeld"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Indien ingeschakeld wordt de laatst gebruikte status hersteld."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
@@ -3579,7 +3528,7 @@ msgstr ""
 "Indien ingeschakeld worden contacten die machtiging aanvragen automatisch "
 "geaccepteerd."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3588,12 +3537,12 @@ msgstr ""
 "Indien uitgeschakeld zal deze account uitgeschakeld worden en niet "
 "weergegeven worden in het roostervenster."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3603,15 +3552,15 @@ msgstr ""
 "over een niet-beveiligde verbinding. Kan ‘warn’ (waarschuwen), "
 "‘connect’ (verbinden) of ‘disconnect’ (verbinding verbreken) zijn"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
@@ -3622,7 +3571,7 @@ msgstr ""
 "opslaan. Je kan ook je eigen accountnaam toevoegen om niets van die account "
 "op te slaan."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3631,7 +3580,7 @@ msgstr ""
 "Aantal seconden te wachten op antwoord van ping-alive-pakket vooraleer "
 "poging tot opnieuw verbinden?"
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3640,7 +3589,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim je IP-adres en proxy’s gedefinieerd in de optie "
 "file_transfer_proxies gebruiken voor bestandsoverdracht."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 #, fuzzy
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
@@ -3650,30 +3599,30 @@ msgstr ""
 "opstarten. De proxy’s van Openfire slagen vaak niet in deze test, zelfs als "
 "ze wel werken."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Indien ingeschakeld zal Gajim een pictogram weergeven om te tonen dat een "
 "verzonden bericht ontvangen is door je contact"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Laat Gajim toe informatie te versturen over het besturingssysteem dat je "
 "gebruikt."
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim toelaten je lokale tijd te sturen."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Bericht dat verzonden wordt naar contacten die je wil toevoegen"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3682,7 +3631,7 @@ msgstr ""
 "Indien ingeschakeld zal Gajim je lokale IP-adressen verzenden, zodat je "
 "contact verbinding kan maken met je apparaat om bestanden te delen."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
@@ -3691,12 +3640,7 @@ msgstr ""
 "Door spaties gescheiden lijst van JID’s waarmee bij volgend opstarten "
 "automatisch een gespreksvenster geopend moet worden."
 
-#: gajim/common/config.py:349
-#, fuzzy
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr "HTTP-upload: schakel HTTPS-verificatie in"
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 #, fuzzy
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
@@ -3705,12 +3649,12 @@ msgstr ""
 "Voorkeursmechanisme voor bestandsoverdracht bij verslepen en neerzetten van "
 "bestand op gespreksvenster. Kan ‘httpupload’ (standaard) of ‘jingle’ zijn"
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Certificaatverificatie met POSH toestaan"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3720,12 +3664,12 @@ msgstr ""
 "Mogelijke waarden: all (alle), composing_only (alleen ‘aan het typen’), "
 "disabled (uitgeschakeld)"
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "De momenteel actieve versleuteling voor dat contact"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 #, fuzzy
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
@@ -3733,7 +3677,7 @@ msgstr ""
 "Stel in of er voor elk bericht in dit groepsgesprek een melding moet worden "
 "getoond"
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
@@ -3742,13 +3686,13 @@ msgstr ""
 "Toon een statusbericht voor alle statuswijzigingen (afwezig, dnd, enz.) van "
 "gebruikers in een groepsgesprek"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr ""
 "Toon een statusbericht voor alle deelnemen/verlaten in een groepsgesprek"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 #, fuzzy
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
@@ -3757,7 +3701,7 @@ msgstr ""
 "Of het groepsgesprek geminimaliseerd wordt naar het rooster bij automatische "
 "deelname"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
@@ -3765,7 +3709,7 @@ msgid ""
 msgstr ""
 "Of het groepsgesprek geminimaliseerd wordt naar het rooster bij sluiten"
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3775,7 +3719,7 @@ msgstr ""
 "Mogelijke waarden: all (alle), composing_only (alleen ‘aan het typen’), "
 "disabled (uitgeschakeld)"
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3786,84 +3730,84 @@ msgstr ""
 "opgeslagen bij afsluiten van Gajim). Gebruik deze optie NIET om plug-ins in "
 "of uit te schakelen, daarvoor dient de gebruikersinterface."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Eten"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Ik ben aan het werk."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Werken"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefoon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Uit"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Ik ben buiten van het leven aan het genieten."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Ik ben aanwezig."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Ik sta open voor gesprekken."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Zo terug."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Ik ben niet beschikbaar."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Niet storen."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Tot ziens!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3872,126 +3816,126 @@ msgstr ""
 "Geluid om af te spelen wanneer een groepsgespreksbericht je bijnaam of een "
 "van de woorden in muc_highlight_words bevat."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr ""
 "Geluid om af te spelen wanneer een bericht in een groepsgesprek toekomt."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Contactrol voor groepsgesprek:Geen"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Ondersteuning voor groepsgesprekken"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Markering in groepsgesprek"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Uitnodiging voor groepsgesprek"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Uitnodiging voor groepsgesprek"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Groepsgesprekbladwijzers"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Ondersteuning voor groepsgesprekken"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Contactrol voor groepsgesprek:Geen"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Aanmaken van groepsgesprekken is niet toegestaan."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Nieuw bericht in groepsgesprek"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "De dienst kon niet gevonden worden"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "%s is geen groepsgespreksserver"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Account ‘Lokaal’ bestaat al."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Groepsgesprek <b>%s</b> bestaat niet."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Status: "
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr "Dit bericht is versleuteld met OTR en kon niet ontsleuteld worden."
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -3999,7 +3943,7 @@ msgstr ""
 "Dit bericht is versleuteld met Legacy OpenPGP en kon niet ontsleuteld "
 "worden. Installeer de PGP-plug-in om deze berichten te verwerken."
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 #, fuzzy
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
@@ -4008,921 +3952,921 @@ msgstr ""
 "Dit bericht is versleuteld met Legacy OpenPGP en kon niet ontsleuteld "
 "worden. Installeer de PGP-plug-in om deze berichten te verwerken."
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr "Dit bericht is versleuteld met %s en kon niet ontsleuteld worden."
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Klusjes doen"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Boodschappen doen"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Schoonmaken"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Koken"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Onderhoud"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Afwas doen"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Was doen"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Tuinieren"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Opdracht uitvoeren"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Wandelen met de hond"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Drinken"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Bier drinken"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Koffie drinken"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Thee drinken"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Een snack eten"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Ontbijten"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Dineren"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Lunchen"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Sporten"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Fietsen"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Dansen"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Wandelen"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Joggen"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Sporten"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Lopen"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Skiën"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Zwemmen"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Trainen"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Verzorgen"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "In de spa"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Tanden poetsen"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Bij de kapper"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Scheren"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Een bad nemen"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Een douche nemen"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Afspraak"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inactief"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Dagje vrij"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Rondhangen"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Verstopt"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Vakantie"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Bidden"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Geplande vakantie"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Denken"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Ontspannen"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Vissen"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Gamen"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Uitgaan"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Feesten"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Lezen"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Oefenen"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Winkelen"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Roken"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Socialiseren"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Zonnebaden"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "TV kijken"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Film kijken"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Praten"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "In het echte leven"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Bellen"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Op een videofoon"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Reizen"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Pendelen"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Rijden"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "In een auto"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "Op een bus"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "Op een vliegtuig"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Op een trein"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Op reis"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Wandelen"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programmeren"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "In een vergadering"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Studeren"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Schrijven"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Bang"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Verwonderd"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Amoureus"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Boos"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Geïrriteerd"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Gespannen"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Opgewonden"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Beschaamd"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Verveeld"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Moedig"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Kalm"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Voorzichtig"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Koud"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Zelfverzekerd"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Verward"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Contemplatief"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Tevreden"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Chagrijnig"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Gek"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Creatief"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Nieuwsgierig"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Neerslachtig"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Depressief"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Teleurgesteld"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Walgend"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Ontzet"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Afgeleid"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Beschaamd"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Jaloers"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Enthousiast"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Flirterig"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Gefrustreerd"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Dankbaar"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Rouwen"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Knorrig"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Schuldig"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Blij"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Hoopvol"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Heet"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Vernederd"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Vernederd"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Hongerig"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Gekwetst"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Onder de indruk"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "In ontzag"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Verliefd"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Verontwaardigd"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Geïnteresseerd"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Bedwelmd"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Onoverwinnelijk"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Jaloers"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Eenzaam"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Verloren"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Gelukkig"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Gemeen"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Humeurig"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nerveus"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Beledigd"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Woedend"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Speels"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Trots"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Ontspannen"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Opgelucht"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Spijt"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Rusteloos"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Triest"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarcastisch"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Tevreden"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Serieus"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Geschokt"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Verlegen"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Ziek"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Slaperig"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontaan"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Gestresseerd"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Sterk"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Verrast"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Dankbaar"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Dorstig"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Moe"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Niet gedefinieerd"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Zwak"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Bezorgd"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "precisie"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "alt"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "gebied"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "lager"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "bouwen"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "land"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "landcode"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "datum"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "beschrijving"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "fout"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "verdiep"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "breedte"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "plaats"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "lengte"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "postcode"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "regio"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "groepsgesprek"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "snelheid"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "straat"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "tekst"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "tijdsaanduiding"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Kan uitgever van certificaat niet ophalen"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Kan CRL van certificaat niet ophalen"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kan certificaatsondertekening niet ontsleutelen"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kan CRL-ondertekening niet ontsleutelen"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Kan publieke sleutel van uitgever niet ontcijferen"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Certificaatsondertekeningsfout"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "CRL-handtekeningsfout"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Certificaat is nog niet geldig"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Certificaat is verlopen"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL is nog niet geldig"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL is verlopen"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatteringsfout in notBefore-veld van certificaat"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatteringsfout in notAfter-veld van certificaat"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatteringsfout in lastUpdate-veld van CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatteringsfout in nextUpdate-veld van CRL"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Geheugentekort"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Zelfgetekend certificaat"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Zelfgetekend certificaat in certificaatsketen"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Kan lokale uitgever van certificaat niet ophalen"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Kan het eerste certificaat niet verifiëren"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Certificaatketen te lang"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certificaat ingetrokken"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Ongeldig CA-certificaat"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Padlengtelimiet overschreden"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Niet-ondersteund certificaatsdoel"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certificaat niet vertrouwd"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certificaat geweigerd"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Subjectuitgever komt niet overeen"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoriteit en subjectsleutelidentificatie komen niet overeen"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoriteit en uitgeverserienummer komen niet overeen"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Sleutelgebruik bevat geen certificaatondertekening"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Toepassingsverificatie mislukt"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certificaat ingetrokken"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Onbekende SSL-fout: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Certificaat is verlopen"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Machtiging geaccepteerd"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Account is uitgeschakeld"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Gebruikersreferenties"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Versleutelingsfout"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Extensie wordt niet ondersteund"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Authenticatie met ‘%s’ mislukt"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4984,12 +4928,12 @@ msgstr "venster1"
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s-configuratiefout"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -5008,289 +4952,248 @@ msgstr ""
 "Fout was:\n"
 "%(error)s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "audio-invoer"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "audio-uitvoer"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "video-invoer"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Server moet tussen 1 en 1023 bytes lang zijn"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Ongeldig teken in hostnaam."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Server adres vereist."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Gebruikersnaam moet tussen 1 en 1023 bytes lang zijn"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Ongeldig teken in gebruikersnaam."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "Bron moet tussen 1 en 1023 bytes lang zijn"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Ongeldig teken in bron."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Bezig"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Niet beschikbaar"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Niet beschikbaar"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "Open voor _gesprek"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Open voor gesprek"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "?gebruikersstatus:_Aanwezig"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "?gebruikersstatus:Aanwezig"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Afwezig"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Offline"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?contact heeft status:Onbekend"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?contact heeft status:Heeft fouten"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Abonnement dat we al hebben:Geen"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Aan"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Van"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Beide"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Vragen (voor abonnering):Geen"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Contactrol voor groepsgesprek:Geen"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Aansluiting van contact in groepsgesprek:Geen"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Eigenaar"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Lid"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Lid"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 msgid "is composing a message…"
 msgstr "is een bericht aan het typen…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tabblad gesloten"
 
 # Kan beter.
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d bericht in afwachting"
 msgstr[1] "%d berichten in afwachting"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "in _groepsgesprekken"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr "van gebruiker %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "van %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d lopende gebeurtenis"
 msgstr[1] "%d lopende gebeurtenissen"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Ik wil je graag toevoegen aan mijn contacten."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Hallo, ik ben $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Time-out bij laden van afbeelding"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Afbeelding is te groot"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "PyCURL is niet geïnstalleerd"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "Fout bij laden van afbeelding"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is een bestand maar zou een map moeten zijn"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
@@ -5393,85 +5296,85 @@ msgstr "Machine gaat slapen"
 msgid "Disconnect from the network"
 msgstr "Netwerkverbinding verbreken"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Bestand is leeg"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Bestand bestaat niet"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr "Bestand is te groot, maximale bestandsgrootte is: %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 msgid "Encrypting file…"
 msgstr "Bestand versleutelen…"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 #, fuzzy
 msgid "Requesting HTTP File Upload Slot…"
 msgstr "HTTP-uploadslot opvragen…"
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 #, fuzzy
 msgid "Uploading via HTTP File Upload…"
 msgstr "Bestand uploaden met HTTP-bestandsupload…"
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Statusinformatie wijzigen"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Status veranderen"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Stel het type en beschrijving van de aanwezigheid in"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Open voor gesprek"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Online"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Lang weg"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Niet storen"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Offline - verbinding verbreken"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Aanwezigheidsbeschrijving:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "De status is veranderd."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Contact verzonden: ‘%(jid)s’ (%(name)s)"
 
 # Verzonden aan contacten?
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Verzonden contacten:"
 
@@ -5494,7 +5397,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Account"
 
@@ -5505,7 +5408,7 @@ msgstr "Groepsgesprekken"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -5525,7 +5428,7 @@ msgstr "Recente groepsgesprekken"
 msgid "Search group chats on selected server"
 msgstr "Doorzoek de groepsgesprekken op de geselecteerde server"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
 msgstr "Lid worden"
 
@@ -5543,17 +5446,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Annuleren"
 
@@ -5696,7 +5599,7 @@ msgstr "Contactinformatie"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -5879,40 +5782,45 @@ msgstr "Werk"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Info"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Deelnemen aan groepsgesprek"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Zo terug"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Binnengaan"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Account %s wordt verwijderd"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "Selecteer bestanden"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5984,6 +5892,7 @@ msgid "Strike"
 msgstr "Doorstrepen"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Kleur"
 
@@ -5995,137 +5904,133 @@ msgstr "Lettertype"
 msgid "Clear formatting"
 msgstr "Opmaak wissen"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 msgid "Choose encryption"
 msgstr "Kies een versleutelingstype"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Een lijst van emoji’s weergeven (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Wordt verbannen…"
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Na bijnaam:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Bijnaam veranderen"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Onderwerp veranderen"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Voer nieuw wachtwoord in:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Groepsgesprekken verlaten"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
 "tijdens het opstarten"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Er is een fout opgetreden:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Opnieuw verifiëren…"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Deelnemer"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "Uit_schoppen"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 #, fuzzy
 msgid "Insert Emoji"
 msgstr "ASCII-emoji’s _converteren"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Je kan ook een andere locatie opgeven:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Deelnemer"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Nieuw groepsgesprek"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "%s vernietigen"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Je kan ook een andere locatie opgeven:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Reden"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Voer een nieuwe naam in voor groep %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Uit_nodigen"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Gebeurtenistype"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Gebeurtenisbeschrijving"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -6210,18 +6115,18 @@ msgid "Add"
 msgstr "Toevoegen"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 msgid "Resource"
 msgstr "Bron"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6230,7 +6135,7 @@ msgid "Client"
 msgstr "Cliënt"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "Systeem"
 
@@ -6361,26 +6266,16 @@ msgstr "_Venstergedrag"
 msgid "_Show contact list on startup"
 msgstr "Roo_ster weergeven bij opstarten"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr "_Avatar weergeven in gesprekstabbladen"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-"Indien aangevinkt zal de avatar van het contact worden weergegeven in "
-"gesprekstabbladen"
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr "_Tabbladplaatsing"
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 #, fuzzy
 msgid "_Quit Gajim when closing contact list"
 msgstr "Gajim af_sluiten bij sluiten van roostervenster"
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 #, fuzzy
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
@@ -6389,16 +6284,25 @@ msgstr ""
 "Indien ingeschakeld zal Gajim zichzelf afsluiten bij het sluiten van het "
 "roostervenster, in plaats van te minimaliseren naar het systeemvak"
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr "Gedrag van vensters en tabbladen"
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Accounts samenvoe_gen"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "A_vatars van contacten in rooster weergeven"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6407,12 +6311,12 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactavatars in het roostervenster en in "
 "groepsgesprekken weergeven"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Statusberichte_n van contacten weergeven in rooster"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6421,7 +6325,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam, in het roostervenster en in groepsgesprekken weergeven"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
@@ -6429,7 +6333,7 @@ msgstr ""
 "E_xtra informatie over contacten in rooster weergeven (stemming, activiteit, "
 "…)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 #, fuzzy
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
@@ -6440,40 +6344,40 @@ msgstr ""
 "rooster worden weergegeven. Extra informatie (aangeboden via PEP) kan bv. "
 "stemming, activiteit, deuntje, locatie, … omvatten"
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
 # Verzonden aan contacten?
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Verzonden contacten:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "in _groepsgesprekken"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Roosteritemuitwisseling"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr "Spelling_controle inschakelen"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6485,11 +6389,11 @@ msgstr ""
 "rechterklikken op het invoerveld zal de standaardtaal voor dit contact of "
 "groepsgesprek gebruikt worden. Hiervoor moet gspell geïnstalleerd zijn."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 msgid "Show message recei_pts (✔)"
 msgstr "Ontvangst_bevestigingen weergeven (✔)"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
@@ -6499,16 +6403,16 @@ msgstr ""
 "wanneer dit ontvangen is. Let op: dit wordt niet door alle cliënten "
 "ondersteund en is dus niet noodzakelijk accuraat."
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Toon een lijst van opmaakstijlen"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 msgid "Display status messages in _single chats"
 msgstr "Statusberichten weergeven in enkele ge_sprekken"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
@@ -6516,26 +6420,26 @@ msgstr ""
 "Indien aangevinkt zullen statusregels in 1-op-1-gesprekken worden "
 "weergegeven in wanneer een contact zijn/haar status of statusbericht aanpast"
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 msgid "Show subject after _joining a group chat"
 msgstr "Onderwerp weergeven bi_j deelnemen aan groepsgesprek"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr ""
 "Indien aangevinkt zal het onderwerp van het groepsgesprek worden weergegeven "
 "bij deelnemen"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 msgid "Group Chat Settings"
 msgstr "Gespreksinstellingen"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr "Deelnemen/verlaten tonen (standaard)"
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 #, fuzzy
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
@@ -6545,7 +6449,7 @@ msgstr ""
 "weergegeven. Deze instelling kan in het groepsgespreksmenu worden "
 "overschreven."
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 #, fuzzy
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
@@ -6555,15 +6459,15 @@ msgstr ""
 "groepsgesprekken. Deze instelling kan in het groepsgespreksmenu worden "
 "overschreven."
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr "Standaarddrempelwaarde voor synchronisatie"
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 msgid "Show status changes (Default)"
 msgstr "Statusveranderingen tonen (standaard)"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 #, fuzzy
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
@@ -6572,11 +6476,11 @@ msgstr ""
 "Of berichten over statuswijzigingen in het groepsgesprek worden weergegeven. "
 "Deze instelling kan in het groepsgespreksmenu worden overschreven."
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 msgid "Show chatstate in tabs"
 msgstr "Chatstatus tonen in tabbladen"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
@@ -6584,12 +6488,12 @@ msgstr ""
 "Indien aangevinkt zal het tabblad ingekleurd worden naargelang de huidige "
 "chatstatus van het contact"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Chatstatus tonen in tabbladen"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
@@ -6597,98 +6501,99 @@ msgstr ""
 "Indien aangevinkt zal de contactrij worden ingekleurd naargelang de huidige "
 "chatstatus van het contact"
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr "Chatstatus tonen in banier"
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
 "Indien aangevinkt zal een beschrijving van de huidige chatstatus van het "
 "contact worden weergegeven in de banier"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 msgid "Chatstate"
 msgstr "Chatstatus"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Gesprek"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 msgid "Show _notification area icon"
 msgstr "Pictogram weergeven i_n meldingsvak"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 msgid "_When new event is received"
 msgstr "Wanneer een _nieuwe gebeurtenis wordt ontvangen"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Pop-ups/meldingen weergeven wanneer gespreksvenster ge_opend is"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Laat pop-ups/meldingen zien wanneer ik _afwezig, niet beschikbaar, bezig of "
 "onzichtbaar ben"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Geef mij bericht over contacten die _inloggen"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 "Een pop-upvenster over net ingelogde contacten zal rechtsonder verschijnen"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Geef mij bericht over contacten die uitl_oggen"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 "Een pop-upvenster over net uitgelogde contacten zal rechtsonder verschijnen"
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Visuele meldingen"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Geluiden af_spelen"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Behere_n…"
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Afspelen van geluiden toestaan wanneer ik _bezig ben"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 msgid "Sounds"
 msgstr "Geluiden"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Meldingen"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 msgid "No_t Available"
 msgstr "Nie_t beschikbaar"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
@@ -6696,7 +6601,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim je status veranderen naar ‘Niet beschikbaar’ "
 "wanneer de computer niet gebruikt is voor de opgegeven tijdsduur"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
@@ -6704,7 +6609,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim je status veranderen naar ‘Afwezig’ wanneer de "
 "computer niet gebruikts is voor de opgegeven tijdsduur"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6716,7 +6621,7 @@ msgstr ""
 "$S zal worden vervangen door vorig statusbericht.\n"
 "$T zal worden vervangen door automatische afwezigheidstime-out."
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6728,19 +6633,19 @@ msgstr ""
 "$S zal worden vervangen door vorig statusbericht.\n"
 "$T zal worden vervangen door automatische onbeschikbaarheidstime-out."
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 msgid "Minutes"
 msgstr "Minuten"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 msgid "Automatic Status"
 msgstr "Automatische status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr "Status van vorige sessie onthouden en he_rstellen"
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
@@ -6748,19 +6653,19 @@ msgstr ""
 "Indien aangevinkt zullen de status en het statusbericht gebruikt in de "
 "vorige sessie worden hersteld"
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 msgid "Ask for status message when I"
 msgstr "Vraag om statusbericht wanneer ik"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_inlog"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "uitl_og"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6768,60 +6673,60 @@ msgstr ""
 "Indien ingeschakeld zal Gajim niet vragen naar een statusbericht. In plaats "
 "daarvan zal het opgegeven standaardbericht gebruikt worden."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Standaardbericht"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 msgid "Status Messages"
 msgstr "Statusberichten"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Vooraf ingestelde statusberichten"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 msgid "Themes"
 msgstr "Thema’s"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 msgid "_Theme"
 msgstr "_Thema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Kleur en lettertype van de gebruikersinterface configureren"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 msgid "_Dark Theme"
 msgstr "_Donker thema"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr "Emoji’s"
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 msgid "_Emoji Theme"
 msgstr "_Emoji-thema"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr "Pictogrammen"
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 msgid "_Status iconset"
 msgstr "_Statuspictogrammenset"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 msgid "Use transports _icons"
 msgstr "Transportp_ictogrammen gebruiken"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
 "ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)"
@@ -6830,66 +6735,66 @@ msgstr ""
 "protocol horen (bv. contacten van ICQ zullen met ICQ-pictogrammen worden "
 "weergegeven voor status online, afwezig, bezig, enz…)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr "ASCII-emoji’s _converteren"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Stijl"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Functies"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr "A_udio-uitvoerapparaat"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr "_Audio-invoerapparaat"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr "Audio"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr "Video"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 msgid "_Video input device"
 msgstr "_Video-invoerapparaat"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "video-uitvoer"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr "Video_framerate"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr "Video_grootte"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr "_Eigen videobron weergeven"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Verbinding"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 msgid "STU_N server"
 msgstr "STU_N-server"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
@@ -6897,49 +6802,59 @@ msgstr ""
 "STUN-serverhostnaam. Indien geen gespecifieerd zal\n"
 "Gajim er een proberen te ontdekken van de server. (Bv.: stun.iptel.org)"
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr "Audio/video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr "_Globale proxy"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Beheren…"
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "Houdt statuswijzigingen van contacten bij in het logboek"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 #, fuzzy
 msgid "Enable _debug logging (restart required)"
 msgstr "_Debuglogs inschakelen"
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Indien aangevinkt zal Gajim een logboekbestand bijhouden voor debuggen"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Overige"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr "Let op: wees voorzichtig in het gebruik van deze opties!"
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Openen…"
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Geavanceerde configuratie (ACE)"
 
@@ -7114,12 +7029,12 @@ msgstr "gebruiker@voorbeeld.nl"
 msgid "Your password"
 msgstr "Voer nieuw wachtwoord in:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Gea_vanceerde Acties"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Gebruik aangepaste hostnaam/poort"
@@ -7206,7 +7121,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_inlog"
@@ -7220,7 +7135,7 @@ msgstr "Kies een bijnaam"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7247,8 +7162,8 @@ msgstr "He_rstellen naar standaardwaarden"
 msgid "Resets value to default"
 msgstr "He_rstellen naar standaardwaarden"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 msgid "Hostname"
 msgstr "Hostnaam"
 
@@ -7289,7 +7204,7 @@ msgstr "Certificaat bekijken…"
 msgid "Proxy Host"
 msgstr "Proxy_host"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Type"
 
@@ -7302,8 +7217,7 @@ msgstr "_Protocol"
 msgid "Copy info to clipboard"
 msgstr "Info kopiëren naar klembord"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Functies"
 
@@ -7478,6 +7392,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Statusbericht wijzigen…"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Stemming:</b>"
@@ -7547,9 +7466,10 @@ msgid "Installed"
 msgstr "Geïnstalleerd"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "Hier wordt een beschrijving van de plug-in weergegeven. Deze tekst wordt "
 "gewist tijdens initialisatie van het plug-invenster."
@@ -7728,73 +7648,105 @@ msgstr "Instellingen"
 msgid "_Name"
 msgstr "_Naam"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 msgid "Proxy"
 msgstr "Proxy"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Gesprek beginnen"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Groepsgesprekken verlaten"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Geschiedenisbeheer"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Plug-ins"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
-msgstr "Voorkeuren"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+msgid "_Preferences"
+msgstr "_Voorkeuren"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "Afsluiten"
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Accounts"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
+#, fuzzy
+msgid "_View"
 msgstr "Weergeven"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Alleen actieve contacten weergeven"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
+#, fuzzy
+msgid "Show _Offline Contacts"
 msgstr "Offline contacten weergeven"
 
 #: gajim/data/gui/application_menu.ui:50
-msgid "Show Active Contacts"
+#, fuzzy
+msgid "Show _Active Contacts"
 msgstr "Alleen actieve contacten weergeven"
 
 #: gajim/data/gui/application_menu.ui:54
-msgid "Show Transports"
+#, fuzzy
+msgid "Show _Transports"
 msgstr "Transporten weergeven"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML-console"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Bestandsoverdracht"
+
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
+#, fuzzy
+msgid "_Help"
 msgstr "Hulp"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Online"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Functies"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Info"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7809,6 +7761,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Groepsgesprekken verlaten"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8078,54 +8035,62 @@ msgstr "Gesprekssneltoetsen"
 msgid "Create new group chat"
 msgstr "Groepsgesprekken verlaten"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Plug-ins"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 msgid "File transfers"
 msgstr "Bestandsoverdrachten"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr "Statusbericht instellen"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "_XML-console weergeven"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Uiterlijk"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Offline contacten weergeven"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 msgid "Show only active contacts"
 msgstr "Alleen actieve contacten weergeven"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 #, fuzzy
 msgid "Enable contact list filtering"
 msgstr "Roosterfilters inschakelen"
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Alleen actieve contacten weergeven"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Contacten"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "Contactinformatie"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr "Contact hernoemen"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "Contact verwijderen"
 
@@ -8196,12 +8161,16 @@ msgstr "Vul het formulier in."
 msgid "Group Chat Configuration"
 msgstr "Groepsgespreksconfiguratie"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML-console"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "Gesprek beginnen…"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "Filteren"
 
@@ -8244,10 +8213,6 @@ msgstr "Toon alle wachtende gebeurt_enissen"
 msgid "Mute Sounds"
 msgstr "Geluiden dempen"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-msgid "_Preferences"
-msgstr "_Voorkeuren"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8586,132 +8551,132 @@ msgstr "%(progress)s van %(total)s MiB verzonden"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Contactrol voor groepsgesprek:Geen"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s neemt nu deel aan het groepsgesprek"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Markering in groepsgesprek"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 #, fuzzy
 msgid "This group chat is restricted to members only"
 msgstr ""
 "Of het groepsgesprek geminimaliseerd wordt naar het rooster bij sluiten"
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Ondersteuning voor groepsgesprekken"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 #, fuzzy
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 "Semi-anoniem\n"
 "<span size=\"small\">(Enkel moderators kunnen je XMPP-adres zien)</span>"
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Markering in groepsgesprek"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 #, fuzzy
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 "Semi-anoniem\n"
 "<span size=\"small\">(Enkel moderators kunnen je XMPP-adres zien)</span>"
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Contactrol voor groepsgesprek:Geen"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Ondersteuning voor groepsgesprekken"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Markering in groepsgesprek"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Contactrol voor groepsgesprek:Geen"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Deze ruimte heeft geen onderwerp"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Ondersteuning voor groepsgesprekken"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Ondersteuning voor groepsgesprekken"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Ondersteuning voor groepsgesprekken"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Contactrol voor groepsgesprek:Geen"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Uitnodiging voor groepsgesprek"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Deze sessie ZAL gearchiveerd worden op de server"
@@ -8740,7 +8705,7 @@ msgid "Sender: %s"
 msgstr "Afzender: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
@@ -8893,7 +8858,7 @@ msgstr "Bestand: "
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Afzender: "
 
@@ -8907,7 +8872,7 @@ msgid "Change"
 msgstr "Bijnaam veranderen"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Zo terug"
@@ -8938,11 +8903,12 @@ msgid "Password Change Failed"
 msgstr "Wachtwoord vereist"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Er is een fout opgetreden bij het aanmaken van de account"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Verander wachtwoord"
 
@@ -8980,41 +8946,37 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Onbekende SSL-fout: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Nieuw gesprek starten"
+msgid "Start / Join Chat"
+msgstr "Gesprek beginnen"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Deelnemen aan groepsgesprek"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-msgid "Add Contact"
-msgstr "Contact toevoegen"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s groepsgesprekken gevonden"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze dienst heeft nog niet geantwoord met gedetailleerde informatie"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9023,34 +8985,34 @@ msgstr ""
 "Deze dienst kon niet antwoorden met gedetailleerde informatie.\n"
 "Het is waarschijnlijk verouderd of kapot"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Overigen"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Groupsgesprek"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Zonder verbinding is het niet mogelijk te bladeren door aangeboden diensten"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienstontdekking met account %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Dienstontdekking"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "De dienst kon niet gevonden worden"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9058,143 +9020,143 @@ msgstr ""
 "Er bestaat geen dienst op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer het opnieuw."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "De dienst kan niet worden doorbladerd"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Dit soort dienst heeft geen items om te doorbladeren."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Ongeldige servernaam"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bladeren op %(address)s met account %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr "Bladeren"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Deze dienst heeft geen items om te doorbladeren."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Opdrachten"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistreren"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Onderzoeken van %(current)d / %(total)d…"
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Gebruikers"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Knooppunt"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nieuwe post"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "Abonnement _opzeggen"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "onderwerp"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel bericht met account %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel bericht in account %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Enkel bericht"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "%s verzenden"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "%s ontvangen"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Teken niet toegestaan"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met ‘%s’."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr ""
 "Het is niet mogelijk een bericht te sturen naar %s, deze JID is ongeldig."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
@@ -9238,29 +9200,11 @@ msgstr "Registratie geslaagd"
 msgid "Registration failed"
 msgstr "Registratie mislukt"
 
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Woordenboek voor taal ‘%s’ niet beschikbaar"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Installeer het ‘%s’-woordenboek voor spellingscontrole, of kies een andere "
-"taal door de optie speller_language in te stellen.\n"
-"\n"
-"Functie voor markeren van verkeerd gespelde woorden zal niet gebruikt worden"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 msgid "Certificate"
 msgstr "Certificaat"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
@@ -9269,73 +9213,73 @@ msgstr ""
 "Certificaat voor account\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 #, fuzzy
 msgid "Issued to\n"
 msgstr "Uitgegeven aan"
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 #, fuzzy
 msgid "Common Name (CN): "
 msgstr "Algemene naam (CN)"
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 #, fuzzy
 msgid "Organization (O): "
 msgstr "Organisatie (O)"
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 #, fuzzy
 msgid "Organizational Unit (OU): "
 msgstr "Organisatorische eenheid (OU)"
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Serienummer"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 #, fuzzy
 msgid "Issued by\n"
 msgstr "Uitgegeven door"
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 #, fuzzy
 msgid "Validity\n"
 msgstr "Geldigheid"
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 #, fuzzy
 msgid "Issued on: "
 msgstr "Uitgegeven op"
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "Verloopt op"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 #, fuzzy
 msgid "SHA-1:"
 msgstr "SHA-1"
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 #, fuzzy
 msgid "SHA-256:"
 msgstr "SHA-256"
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 msgid "Group Chat Invitation "
 msgstr "Uitnodiging voor groepsgesprek"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 "<b>%(contact)s</b> heeft u uitgenodigd in groepsgesprek <b>%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
@@ -9348,6 +9292,10 @@ msgstr "GG-nummer"
 msgid "ICQ Number"
 msgstr "ICQ-nummer"
 
+#: gajim/gtk/add_contact.py:42
+msgid "Add Contact"
+msgstr "Contact toevoegen"
+
 #: gajim/gtk/add_contact.py:260
 #, python-format
 msgid "%s Missing"
@@ -9399,9 +9347,9 @@ msgid "Error while adding transport contact"
 msgstr "Fout bij toevoegen van transportcontact"
 
 #: gajim/gtk/add_contact.py:486
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9544,39 +9492,59 @@ msgstr "Achtergrond voor afgemeld contact"
 msgid "Contact Connected Background "
 msgstr "Achtergrond voor aangemeld contact"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Statusberichtkleur"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Statusberichtkleur"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Statusberichtkleur"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Statusberichtkleur"
+
+#: gajim/gtk/themes.py:187
 msgid "Gajim Themes"
 msgstr "Gajim-thema’s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 msgid "Invalid Name"
 msgstr "Ongeldige naam"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr "Naam <b>standaard</b> is niet toegestaan"
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 msgid "Spaces are not allowed"
 msgstr "Spaties zijn niet toegestaan"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Wil je dit thema voorgoed verwijderen?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Deze naam is al in gebruik. Wil je dit statusbericht overschrijven?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 msgid "Delete Theme"
 msgstr "Thema verwijderen"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Plug-in-instellingen"
@@ -9600,10 +9568,9 @@ msgid "Error: %s"
 msgstr "Fout: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Fout"
 
@@ -9617,43 +9584,43 @@ msgstr "Status is nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "Openen"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Nieuwe e-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 msgid "Clear File"
 msgstr "Bestand wissen"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
 msgstr "Proxy’s beheren"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 msgid "No Proxy"
 msgstr "Geen proxy"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 msgid "Adjust to Status"
 msgstr "Aanpassen aan status"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "Aan"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Uit"
 
@@ -9673,7 +9640,7 @@ msgstr "Accountrijlettertype"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Je nieuwe account is aangemaakt"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9705,43 +9672,47 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Account %s is nog verbonden"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Geschiedenis synchroniseren"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Hoe ver terug wil je gaan?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "Een maand"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "Drie maanden"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Een jaar"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "Alles"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "Verbinden…"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s van %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "%s berichten gedownload"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, fuzzy, python-format
 msgid ""
 "Finished synchronising chat history:\n"
@@ -9752,7 +9723,7 @@ msgstr ""
 "        {received} berichten gedownload.\n"
 "        "
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 #, fuzzy
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
@@ -9761,7 +9732,7 @@ msgstr ""
 "        met het archief.\n"
 "        "
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 #, fuzzy
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
@@ -9773,7 +9744,7 @@ msgstr ""
 # TODO: Loop alles na, zet zinnen in de goede vorm, volg GNOME NL richtlijnen,
 #       ruim mnemonics op. Zie ook: http://nl.gnome.org/
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Een GTK+ XMPP-cliënt"
@@ -9828,117 +9799,117 @@ msgstr ""
 "Nathan Follens <nthn@unseen.is>\n"
 "Stéphan Kochen <stephan@kochen.nl>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr "Kies het bestand om te verzenden…"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 msgid "Choose Avatar…"
 msgstr "Kies avatar…"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 msgid "PNG files"
 msgstr "PNG-bestanden"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 msgid "JPEG files"
 msgstr "JPEG-bestanden"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr "SVG-bestanden"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Kies archief"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 msgid "ZIP files"
 msgstr "ZIP-bestanden"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr "Bestand opslaan als…"
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "Openen"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s van dit groepsgesprek"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Verbonden"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Bestandsnaam: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 msgid "?Noun:Download"
 msgstr "?Znw:Download"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 msgid "?Noun:Upload"
 msgstr "?Znw:Upload"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Bestandsoverdracht gestopt"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?overdrachtstatus:Gepauzeerd"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?overdrachtstatus:Gepauzeerd"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Beschrijving: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?overdrachtstatus:Gepauzeerd"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?overdrachtstatus:Gepauzeerd"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?overdrachtstatus:Gepauzeerd"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?overdrachtstatus:Gepauzeerd"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?overdrachtstatus:Gepauzeerd"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?overdrachtstatus:Gepauzeerd"
@@ -9947,7 +9918,7 @@ msgstr "?overdrachtstatus:Gepauzeerd"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Ongeldig knooppunt"
@@ -10003,23 +9974,23 @@ msgstr "Vermeld in groepsgesprek"
 msgid "Group Chat Message Received"
 msgstr "Bericht ontvangen in groepsgesprek"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 msgid "Required"
 msgstr "Vereist"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Ja"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "Nee"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10037,11 +10008,6 @@ msgstr "via account %s"
 msgid "Hide _Contact List"
 msgstr "_Contacten uitnodigen"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Alleen actieve contacten weergeven"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
@@ -10087,34 +10053,30 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later opnieuw."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Archiefvoorkeuren voor %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Archiefvoorkeuren"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "Je archiefvoorkeuren zijn opgeslagen!"
 
-#: gajim/gtk/mam_preferences.py:101
-msgid "No response from the Server"
-msgstr "Geen antwoord van de server"
-
-#: gajim/gtk/mam_preferences.py:103
-msgid "Error received: {}"
-msgstr "Fout ontvangen: {}"
-
-#: gajim/gtk/mam_preferences.py:105
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
 msgid "Archiving Preferences Error"
 msgstr "Archiefvoorkeuren"
 
+#: gajim/gtk/mam_preferences.py:108
+msgid "Error received: {}"
+msgstr "Fout ontvangen: {}"
+
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Ingeschakeld"
@@ -10163,47 +10125,47 @@ msgstr "?Vragen (voor abonnering):Geen"
 msgid "?password:Hidden"
 msgstr "Wachtwoord:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s dagen, %(hours)s uur"
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "Archiefvoorkeuren"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Audio / video"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Geeft Gajim de mogelijkheid om audio- en videogesprekken aan te bieden"
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
@@ -10211,12 +10173,12 @@ msgstr ""
 "Vereist: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
 msgstr "Functie niet beschikbaar voor Windows"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
@@ -10224,19 +10186,19 @@ msgstr ""
 "Geeft Gajim de mogelijkheid om de inactiviteitsduur van je computer te meten "
 "om automatische status in te stellen"
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr "Vereist: libxss"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr "Geen extra vereisten"
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf (serverloos chatten)"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
@@ -10244,56 +10206,56 @@ msgstr ""
 "Geeft Gajim de mogelijkheid om cliënten in een lokaal netwerk voor "
 "serverloos chatten automatisch te detecteren"
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Vereist: gir1.2-avahi-0.6"
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Vereist: pybonjour en bonjour-SDK (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Verbindingsopties"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Vereist: Gspell"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Functie niet beschikbaar voor Windows"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Meldingen"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Geeft Gajim de mogelijkheid om audio- en videogesprekken aan te bieden"
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Vereist: python-dbus"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 msgid "Secure Password Storage"
 msgstr "Veilige wachtwoordopslag"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
@@ -10301,48 +10263,47 @@ msgstr ""
 "Geeft Gajim de mogelijkheid om wachtwoorden veilig op te slaan in plaats van "
 "onversleuteld"
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
-"Vereist: libsecret en een provider (zoals Gnome-sleutelbos en KSecretService)"
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Vereist gnome-keyring en python-gnome2-desktop, of kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 "Windows-aanmeldingsgegevensbeheer wordt gebruikt voor veilige "
 "wachtwoordopslag"
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Spellingscontrole"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 "Geeft Gajim de mogelijkheid om de spelling in je berichten te controleren "
 "tijdens het opstellen"
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr "Vereist: Gspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr "UPnP-IGD-poortdoorsturen"
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 "Geeft Gajim de mogelijkheid om je router te vragen een poort door te sturen "
 "voor bestandsoverdrachten"
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Vereist: gir1.2-gupnpigd-1.0"
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Archiefvoorkeuren"
@@ -10389,7 +10350,7 @@ msgstr "Ongeldige lijstnaam"
 msgid "You must enter a name to create a privacy list."
 msgstr "Je moet een naam invullen om een privacylijst aan te maken."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Contacten uitnodigen"
@@ -10417,7 +10378,7 @@ msgstr "Voltooien"
 msgid "Commands"
 msgstr "Opdrachten"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr "Volgende"
 
@@ -10481,120 +10442,134 @@ msgstr "Abonneringsverzoek van %s"
 msgid "Loading"
 msgstr "Bezig met laden"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Verbonden"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Log in"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Er is een fout opgetreden bij het aanmaken van de account"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Account %s wordt verwijderd"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Klik om het wachtwoord van de account te wijzigen"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Verbinden…"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Je server biedt geen ondersteuning voor vCard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Spaties zijn niet toegestaan"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Je server biedt geen ondersteuning voor vCard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Account %s is nog verbonden"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "Account toevoegen…"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Nieuwe post maken"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "Bron moet tussen 1 en 1023 bytes lang zijn"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Gea_vanceerde Acties"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Waarschuwing"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Onbekende SSL-fout: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Account %s wordt verwijderd"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registreren bij %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Accountrijlettertype"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Account is toegevoegd"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Accounts"
@@ -10636,236 +10611,240 @@ msgstr "Zoeken"
 msgid "No results found"
 msgstr "Geen resultaten gevonden"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Standaard"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "statusberichttitel"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "statusberichttekst"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Inloggen"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Nu opnieuw inloggen?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Als je alle wijzigingen onmiddellijk wil toepassen moet je opnieuw inloggen."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 #, fuzzy
 msgid "_Re-Login"
 msgstr "Inloggen"
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Controleer of Avahi of Bonjour is geïnstalleerd."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Controleer of Avahi of Bonjour is geïnstalleerd."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 msgid "Disable Account"
 msgstr "Account uitschakelen"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, python-format
 msgid "Account %s is still connected"
 msgstr "Account %s is nog verbonden"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Alle gespreks- en groepsgespreksvensters zullen worden gesloten. Wil je "
 "doorgaan?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Account uitschakelen"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr "Label"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr "Inloggen"
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "Contacten importeren"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-msgid "Client Certificate"
-msgstr "Cliëntcertificaat"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 msgid "Connect on startup"
 msgstr "Verbinding maken bij opstarten"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 msgid "Save conversations for all contacts"
 msgstr "Gesprekken opslaan voor alle contacten"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr "Berichten opslaan op harde schijf"
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 msgid "Global Status"
 msgstr "Globale status"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 msgid "Synchronise the status of all accounts"
 msgstr "Status van alle accounts synchroniseren"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Gebruik bestandsoverdrachtsproxies"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Inactief sinds:"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Cliëntcertificaat"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Laat Gajim toe informatie te versturen over het besturingssysteem dat je "
 "gebruikt."
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Contacten uitnodigen"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr "Hostnaam voor server handmatig instellen"
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 msgid "Use environment variable"
 msgstr "Omgevingsvariabele gebruiken"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 msgid "Synchronize the status of all accounts"
 msgstr "Status van alle accounts synchroniseren"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 msgid "First Name"
 msgstr "Voornaam"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 msgid "Email"
 msgstr "E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 msgid "Adjust to status"
 msgstr "Aanpassen aan status"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 msgid "Port"
 msgstr "Poort"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Verbindingsopties"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+msgid "Client Certificate"
+msgstr "Cliëntcertificaat"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PKCS12-bestanden"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 msgid "Encrypted Certificate"
 msgstr "Versleuteld certificaat"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Certificaatopties"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 msgid "Save Password"
 msgstr "Wachtwoord opslaan"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Plug-in-instellingen"
@@ -10916,19 +10895,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d contact verwijderd"
 msgstr[1] "%d contacten verwijderd"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Onbekende artiest"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Onbekend nummer"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Onbekende bron"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10942,20 +10921,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Bladwijzers"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Archief corrupt"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "Leeg archief"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "Archief is misvormd"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Plug-in bestaat al"
@@ -11011,7 +10990,7 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Toon volgende wachtende gebeurtenis"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
@@ -11021,7 +11000,7 @@ msgstr ""
 "cliënt te zijn. Met Gajim kan je chatten via verschillende XMPP-diensten "
 "naar keuze (bv. Jabber.org), maar ook via transporten (bv. Facebook, IRC)."
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
@@ -11029,7 +11008,7 @@ msgstr ""
 "Chat met je vrienden of familie, wissel eenvoudig foto’s en gedachten uit of "
 "praat over het nieuws met je groepen."
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
@@ -11037,49 +11016,49 @@ msgstr ""
 "Gajim integreert goed met je andere apparaten: wat je via Gajim zegt zal je "
 "ook op je mobiele apparaat kunnen zien."
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 msgid "Features:"
 msgstr "Functies:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr "Mis nooit een bericht, en hou al je chatcliënten gesynchroniseerd"
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr "Nodig vrienden uit in groepsgesprekken, of neem eraan deel"
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr "Stuur foto’s, video’s of andere bestanden naar vrienden en groepen"
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 #, fuzzy
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr "Chat veilig met eind-tot-eind-versleuteling via OMEMO of PGP"
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr "Gebruik je favoriete emoticons, stel je eigen avatar in"
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr "Bewaar en beheer je gespreksgeschiedenis"
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr "Organiseer je gesprekken met tabbladen"
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr "Automatische spellingscontrole voor je berichten"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 "Maak verbinding met andere Messengers via Transporten (Facebook, IRC, …)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
@@ -11087,62 +11066,209 @@ msgstr ""
 "Zoek dingen op op Wikipedia, in woordenboeken of met andere zoekmachines, "
 "rechtstreeks vanuit het gespreksvenster"
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 "Stel je activiteit, deuntje en humeur in om je vrienden te tonen hoe je je "
 "voelt"
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr "Ondersteuning voor meerdere accounts"
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 "Groepeer meerdere contacten van een vriend tezamen in een enkel metacontact"
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr "XML-console om na te kijken wat er gebeurt in de protocollaag"
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 #, fuzzy
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr "Serverloos chatten (Bonjour/Zeroconf), BOSH"
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
 msgstr ""
 "Ondersteuning voor dienstontdekking, inclusief knooppunten en zoeken naar "
 "gebruikers"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr "Nog meer functies via plug-ins"
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Contacten"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr "Gespreksvenster met tabbladen"
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 msgid "Group chat support"
 msgstr "Ondersteuning voor groepsgesprekken"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Chat history"
 msgstr "Gespreksgeschiedenis"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 msgid "Plugin manager"
 msgstr "Plug-inbeheer"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Nieuw gesprek starten"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "Verbroken verbinding simuleren"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "Herstellen van verbinding simuleren"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Onbekende SSL-fout: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "Vereist: libsecret en een provider (zoals Gnome-sleutelbos en "
+#~ "KSecretService)"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Kies interval tussen 2 controles van inactiviteit."
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Woordenboek voor taal ‘%s’ niet beschikbaar"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Installeer het ‘%s’-woordenboek voor spellingscontrole, of kies een "
+#~ "andere taal door de optie speller_language in te stellen.\n"
+#~ "\n"
+#~ "Functie voor markeren van verkeerd gespelde woorden zal niet gebruikt "
+#~ "worden"
+
+#~ msgid "_Reconnect"
+#~ msgstr "Opnieuw ve_rbinden"
+
+#~ msgid "Quit"
+#~ msgstr "Afsluiten"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Alleen actieve contacten weergeven"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "Contact toevoegen"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Contacten uitnodigen"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Groepsgesprekken verlaten"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Nieuw groepsgesprek"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Indien ingeschakeld zal Gajim een pictogram met ongelezen berichten op "
+#~ "elk tabblad weergeven. Afhankelijk van het thema kan dit pictogram "
+#~ "geanimeerd zijn."
+
+#, fuzzy
+#~ msgid "Show a mini avatar in chat window tabs and as the window's icon."
+#~ msgstr ""
+#~ "Toon een mini-avatar en gespreksvenstertabbladen en in vensterpictogram"
+
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "_Avatar weergeven in gesprekstabbladen"
+
+#~ msgid "If checked, the contact's avatar will be shown in chat tabs"
+#~ msgstr ""
+#~ "Indien aangevinkt zal de avatar van het contact worden weergegeven in "
+#~ "gesprekstabbladen"
+
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Server moet tussen 1 en 1023 bytes lang zijn"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Ongeldig teken in hostnaam."
+
+#~ msgid "Server address required."
+#~ msgstr "Server adres vereist."
+
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Gebruikersnaam moet tussen 1 en 1023 bytes lang zijn"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Ongeldig teken in gebruikersnaam."
+
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "Bron moet tussen 1 en 1023 bytes lang zijn"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Ongeldig teken in bron."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Geef mij bericht over contacten die _inloggen"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Geef mij bericht over contacten die uitl_oggen"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Meldingskleur voor nieuw bericht."
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Achtergrondkleur statuswijzigingsmelding"
+
+#~ msgid "Event Type"
+#~ msgstr "Gebeurtenistype"
+
+#~ msgid "Event desc"
+#~ msgstr "Gebeurtenisbeschrijving"
+
+#, fuzzy
+#~ msgid "HTTP File Upload: Enable HTTPS Verification."
+#~ msgstr "HTTP-upload: schakel HTTPS-verificatie in"
+
+#~ msgid "No response from the Server"
+#~ msgstr "Geen antwoord van de server"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Bronconflict"
 
@@ -11816,9 +11942,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "_Send Private Message"
 #~ msgstr "Ver_stuur privébericht"
 
-#~ msgid "Send _File"
-#~ msgstr "_Bestand Verzenden"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Deelnemers"
@@ -14785,9 +14908,6 @@ msgstr "Plug-inbeheer"
 #~ "voor jouw instellingen kan je hier een andere selecteren.\n"
 #~ "Je kan overwegen mogelijke firewallinstellingen te wijzigen."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Accounts samenvoe_gen"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP is niet bruikbaar op deze computer"
 
@@ -15320,9 +15440,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Vereist python2.5."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Vereist gnome-keyring en python-gnome2-desktop, of kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/pl.po b/po/pl.po
index 530b029e8..4a9d2706d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2013-09-02 10:44+0100\n"
 "Last-Translator: Michał Olber <michal.olber@osworld.pl>\n"
 "Language-Team: Polish <dominik@kozaczko.info, translation-team-pl@lists."
@@ -23,70 +23,77 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, python-format
+msgid "Account: %s"
+msgstr "Konto: %s"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
-msgstr "oraz autoryzowana"
+msgstr "oraz uwierzytelniana"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
-msgstr "oraz NIE autoryzowana"
+msgstr "oraz NIE uwierzytelniana"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s szyfrowanie jest aktywne %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Cofnij"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Wyczyść"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "Wklej jako cytat"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "Wklej obraz"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr "Próbujesz wkleić obraz"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
-msgstr "Czy jesteś pewien, ze chcesz wkleić obraz ze schowka w to okno czatu?"
+msgstr "Czy jesteś pewien, że chcesz wkleić obraz ze schowka w to okno czatu?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "_Wklej"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: gajim/chat_control_base.py:1317
-#, fuzzy, python-format
+#: gajim/chat_control_base.py:1312
+#, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
-msgstr "Jeżeli wyślesz plik do <b>%s</b>, pozna on/ona twój pełny JID."
+msgstr ""
+"Jeśli wyślesz plik do <b>%s</b>, twój pełny adres XMPP zostanie ujawniony."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -104,11 +111,11 @@ msgstr "?Czas: Nieznany"
 
 #: gajim/vcard.py:352
 msgid "?Role in Group Chat:<b>Role:</b>"
-msgstr "?Rola w czacie grupy:<b>rola:</b>"
+msgstr "?Rola w czacie grupowym:<b>rola:</b>"
 
 #: gajim/vcard.py:356
 msgid "<b>Affiliation:</b>"
-msgstr "<b>Grupy:</b>"
+msgstr "<b>Przynależność:</b>"
 
 #: gajim/vcard.py:363
 msgid ""
@@ -116,523 +123,465 @@ msgid ""
 "interested in their presence"
 msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
-"interesujesz się jego/jej statusem."
+"interesujesz się jego statusem."
 
 #: gajim/vcard.py:365
-#, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
-"Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
-"jest zainteresowana twoim."
+"Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on nie jest "
+"zainteresowany twoim."
 
 #: gajim/vcard.py:367
-#, fuzzy
 msgid "The contact and you want to exchange presence information"
-msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
+msgstr "Oboje jesteście zaintersowani swoimi informacjami o statusie"
 
 #: gajim/vcard.py:369
-#, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
-msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
+msgstr "Oboje nie jesteście zainteresowani swoimi informacjami o statusie"
 
 #: gajim/vcard.py:375
 msgid "You are waiting contact's answer about your subscription request"
-msgstr "Oczekujesz na odpowiedź kontaktu dotyczącą prośby o autoryzację"
+msgstr "Oczekujesz na odpowiedź kontaktu dotyczącą twojej prośby o subskrybcję"
 
 #: gajim/vcard.py:377
 msgid "There is no pending subscription request."
-msgstr "Nie ma oczekujących żądań autoryzacji."
+msgstr "Nie ma oczekujących żądań subskrybcji."
 
 #: gajim/vcard.py:382 gajim/vcard.py:432 gajim/vcard.py:531
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
-#, fuzzy
 msgid "Not in contact list"
-msgstr "Wyświetlanie kontaktów offline"
+msgstr "Poza listą kontaktów"
 
-#: gajim/gui_menu_builder.py:359
-#, fuzzy
+#: gajim/gui_menu_builder.py:358
 msgid "I would like to add you to my contact list"
-msgstr "Chciałbym dodać Cię do listy kontaktów."
+msgstr "Chciałbym dodać Cię do mojej listy kontaktów."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
-msgstr "Wyślij pojedynczą wiadomość..."
+msgstr "Wyślij pojedynczą _wiadomość…"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Wykonaj komendę"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
-#, fuzzy
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
-msgstr "_Zmień nazwę"
+msgstr "_Zmień nazwę…"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Cofnij blokadę"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Zablokuj"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
-msgstr "Us_uń"
+msgstr "_Usuń"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
-msgstr "Informacje o kontakcie"
+msgstr "_Szczegóły"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Wyślij plik..."
+#: gajim/gui_menu_builder.py:517
+msgid "Send File"
+msgstr "Wyślij plik"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
-msgstr "Wyślij plik..."
+msgstr "Udostępnij plik…"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
-msgstr "Wyślij plik jako..."
+msgstr "Wyślij plik bezpośrednio..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
-#, fuzzy
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 msgid "Send Chatstate"
-msgstr "Ostatni status %s"
+msgstr "Informuj o zaangażowaniu"
 
-#: gajim/gui_menu_builder.py:523
-#, fuzzy
-msgid "Invite Contacts"
-msgstr "Zaproś kontakty"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+msgid "Invite Contacts…"
+msgstr "Zaproś kontakty…"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
-#, fuzzy
-msgid "Add to Contact List"
-msgstr "_Dodaj kontakt..."
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
+msgid "Add to Contact List…"
+msgstr "Dodaj do listy kontaktów..."
 
-#: gajim/gui_menu_builder.py:525
-#, fuzzy
+#: gajim/gui_menu_builder.py:524
 msgid "Voice Chat"
-msgstr "Prośba o rozmowę głosową"
+msgstr "Rozmowa głosowa"
 
-#: gajim/gui_menu_builder.py:526
-#, fuzzy
+#: gajim/gui_menu_builder.py:525
 msgid "Video Chat"
-msgstr "Video test"
+msgstr "Rozmowa wideo"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
-#, fuzzy
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
-msgstr "Informacje o kontakcie"
+msgstr "Szczegóły"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
-#, fuzzy
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
-msgstr "_Historia"
+msgstr "Historia"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Tylko o pisaniu"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Wszystkie stany rozmowy"
+#: gajim/gui_menu_builder.py:535
+msgid "All Chat States"
+msgstr "Włączone"
+
+#: gajim/gui_menu_builder.py:574
+msgid "Manage Group Chat"
+msgstr "Opuść czat grupowy"
 
 #: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Zaproś kontakty"
+msgid "Rename…"
+msgstr "Zmień nazwę…"
 
 #: gajim/gui_menu_builder.py:576
-#, fuzzy
-msgid "Manage Group Chat"
-msgstr "Opuść pokoje"
+msgid "Change Subject…"
+msgstr "Zmień temat..."
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
-#, fuzzy
-msgid "Rename Group Chat"
-msgstr "Opuść pokoje"
+#: gajim/gui_menu_builder.py:577
+msgid "Upload Avatar…"
+msgstr "Wstaw awatar…"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-#, fuzzy
-msgid "Change Subject"
-msgstr "Zmień _temat..."
+#: gajim/gui_menu_builder.py:578
+msgid "Configure…"
+msgstr "Konfiguruj…"
 
 #: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Opuść pokoje"
+msgid "Destroy…"
+msgstr "Usuń…"
 
-#: gajim/gui_menu_builder.py:580
-#, fuzzy
-msgid "Upload Avatar…"
-msgstr "Wybierz archiwum"
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
+msgid "Chat Settings"
+msgstr "Ustawienia czatu"
 
-#: gajim/gui_menu_builder.py:581
-#, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Nowa rozmowa grupowa"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
+msgstr "Pokazuj Dołącz/Opuść"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
-#, fuzzy
-msgid "Chat Settings"
-msgstr "Wtyczki"
+#: gajim/gui_menu_builder.py:583
+msgid "Show Status Changes"
+msgstr "Pokazuj zmiany statusu"
 
 #: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
-msgstr "Pokaż Dołącz/Opuść"
+msgid "Notify on all Messages"
+msgstr "Powiadamiaj o wszystkich wiadomościach"
 
 #: gajim/gui_menu_builder.py:585
-#, fuzzy
-msgid "Show status changes"
-msgstr "_Zapisuj w logach zmiany statusów kontaktów"
-
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
-msgstr "Powiadamianie o wszystkich wiadomościach"
+msgid "Minimize on Close"
+msgstr "Minimalizuj przy zamknięciu"
 
 #: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
-msgstr "_Minimalizuj przy zamknięciu"
+msgid "Minimize When Joining Automatically"
+msgstr "Minimalizuj po automatycznym dołączeniu"
 
-#: gajim/gui_menu_builder.py:589
-#, fuzzy
-msgid "Minimize when joining automatically"
-msgstr "Minimalizuj po automatycznym wejściu"
-
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "Próg synchronizacji"
 
-#: gajim/gui_menu_builder.py:593
-#, fuzzy
-msgid "Change Nickname"
-msgstr "Zmień pseudo_nim..."
+#: gajim/gui_menu_builder.py:591
+msgid "Change Nickname…"
+msgstr "Zmień pseudonim…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Głos"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-#, fuzzy
-msgid "Execute command"
-msgstr "_Wykonaj komendę"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+msgid "Execute Command…"
+msgstr "Wykonaj polecenie…"
 
-#: gajim/gui_menu_builder.py:597
-#, fuzzy
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
-msgstr "_Opuść"
+msgstr "Opuść"
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "Brak progu"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
-#, fuzzy, python-format
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
+#, python-format
 msgid "%i day"
 msgid_plural "%i days"
-msgstr[0] "%i dni temu"
-msgstr[1] "%i dni temu"
-msgstr[2] "%i dni temu"
+msgstr[0] "%i dzień"
+msgstr[1] "%i dni"
+msgstr[2] "%i dni"
 
-#: gajim/gui_menu_builder.py:673
-#, fuzzy
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Tylko o pisaniu"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Włączone"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
-msgstr "_Dodaj kontakt..."
+msgstr "Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "Wyślij pojedynczą wiadomość..."
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
 msgstr "Wyszukuj usługi"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
-#, fuzzy
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
-msgstr "Serwer"
+msgstr "Informacje o serwerze"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
-#, fuzzy
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
-msgstr "_Ustawienia"
+msgstr "Ustawienia archiwizowania"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Zakładki"
 
-#: gajim/gui_menu_builder.py:682
-#, fuzzy
+#: gajim/gui_menu_builder.py:680
 msgid "PEP Configuration"
-msgstr "Konfiguracja pokoju"
+msgstr "Konfiguracja PEP"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-#, fuzzy
-msgid "Synchronise History"
-msgstr "Synchronizuj"
+#: gajim/gui_menu_builder.py:681
+msgid "Synchronise History…"
+msgstr "Synchronizuj historię…"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
-#, fuzzy
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
-msgstr "_Administrator"
+msgstr "Administrator"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 msgid "Send Server Message…"
 msgstr "Wyślij wiadomość z serwera..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Ustaw MOTD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr "Uaktualnij MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 msgid "Delete MOTD…"
 msgstr "Usuń MOTD"
 
-#: gajim/gui_menu_builder.py:727
-#, fuzzy
+#: gajim/gui_menu_builder.py:725
 msgid "_Add Account…"
-msgstr "_Dodaj kontakt..."
+msgstr "_Dodaj konto…"
 
-#: gajim/gui_menu_builder.py:733
-#, fuzzy
+#: gajim/gui_menu_builder.py:731
 msgid "_Modify Accounts…"
-msgstr "_Modyfikuj konto"
+msgstr "_Modyfikuj konta…"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
-#, fuzzy
 msgid "_Modify Account…"
-msgstr "_Modyfikuj konto"
+msgstr "_Modyfikuj konto…"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Konta"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
-#, fuzzy
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 msgid "Copy XMPP Address"
-msgstr "_Kopiuj JID/Adres e-mail"
+msgstr "Kopiuj adres XMPP"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
-#, fuzzy
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
-msgstr "Dołącz do pokoju"
+msgstr "Dołącz do czatu grupowego"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Dodaj kontakt..."
-
-#: gajim/gui_menu_builder.py:788
-#, fuzzy
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
-msgstr "_Kopiuj adres odnośnika"
+msgstr "Kopiuj adres odnośnika"
 
-#: gajim/gui_menu_builder.py:789
-#, fuzzy
+#: gajim/gui_menu_builder.py:787
 msgid "Open Link in Browser"
-msgstr "_Otwórz Link w przeglądarce"
+msgstr "Otwórz link w przeglądarce"
 
-#: gajim/gui_menu_builder.py:794
-#, fuzzy
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
-msgstr "_Kopiuj JID/Adres e-mail"
+msgstr "Kopiuj adres email"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otwórz Klienta Poczty"
 
-#: gajim/gui_menu_builder.py:800
-#, fuzzy
+#: gajim/gui_menu_builder.py:798
 msgid "Copy Location"
-msgstr "_Kopiuj adres odnośnika"
+msgstr "Kopiuj adres odnośnika"
 
-#: gajim/gui_menu_builder.py:801
-#, fuzzy
+#: gajim/gui_menu_builder.py:799
 msgid "Show Location"
-msgstr "Powiadomienia"
+msgstr "Pokazuj lokalizację"
 
-#: gajim/gui_menu_builder.py:806
-#, fuzzy
+#: gajim/gui_menu_builder.py:804
 msgid "Copy XMPP Address/Email"
-msgstr "_Kopiuj JID/Adres e-mail"
+msgstr "Kopiuj adres XMPP/email"
 
-#: gajim/gui_menu_builder.py:858
-#, fuzzy
+#: gajim/gui_menu_builder.py:856
 msgid "Invite"
-msgstr "_Zaproś"
+msgstr "Zaproś"
 
-#: gajim/gui_menu_builder.py:876
-#, fuzzy
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
-msgstr "_Cofnij blokadę"
+msgstr "Odblokuj"
 
-#: gajim/gui_menu_builder.py:879
-#, fuzzy
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
-msgstr "_Zablokuj"
+msgstr "Zablokuj"
 
-#: gajim/gui_menu_builder.py:885
-#, fuzzy
+#: gajim/gui_menu_builder.py:883
 msgid "Kick"
-msgstr "Wy_rzuć"
+msgstr "Wyrzuć"
 
-#: gajim/gui_menu_builder.py:893
-#, fuzzy
+#: gajim/gui_menu_builder.py:891
 msgid "Ban"
-msgstr "Za_banuj"
+msgstr "Zbanuj"
 
-#: gajim/gui_menu_builder.py:903
-#, fuzzy
+#: gajim/gui_menu_builder.py:901
 msgid "Make Owner"
-msgstr "Właściciel"
+msgstr "Mianuj właścicielem"
 
-#: gajim/gui_menu_builder.py:912
-#, fuzzy
+#: gajim/gui_menu_builder.py:910
 msgid "Make Admin"
-msgstr "_Administrator"
+msgstr "Mianuj administratorem"
 
-#: gajim/gui_menu_builder.py:921
-#, fuzzy
+#: gajim/gui_menu_builder.py:919
 msgid "Make Member"
-msgstr "Uczestnik"
+msgstr "Mianuj uczestnikiem"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Uczestnik"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Głos"
 
-#: gajim/gui_menu_builder.py:963
-#, fuzzy
+#: gajim/gui_menu_builder.py:961
 msgid "Copy"
-msgstr "Pokój:"
+msgstr "Kopiuj"
 
-#: gajim/history_manager.py:70
-#, fuzzy
+#: gajim/history_manager.py:78
 msgid "Usage:"
-msgstr "Wiadomość"
+msgstr "Użytkowanie:"
 
-#: gajim/history_manager.py:72
-#, fuzzy
+#: gajim/history_manager.py:80
 msgid "Options:"
-msgstr "_Emotikony:"
+msgstr "Opcje:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Pokaż ten tekst pomocy i wyjdź"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Wybierz folder dla pliku logu"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "%s nie istnieje."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 msgid "XMPP Address"
 msgstr "Adres XMPP"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -640,382 +589,361 @@ msgstr "Data"
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Wiadomość"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Temat"
 
-#: gajim/history_manager.py:247
-#, fuzzy
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
-msgstr "Błąd bazy danych"
+msgstr "Oczyszczanie bazy danych"
 
-#: gajim/history_manager.py:248
-#, fuzzy
+#: gajim/history_manager.py:255
 msgid "Clean up the database?"
-msgstr "tworzenie bazy danych z logami"
+msgstr "Oczyścić bazę danych?"
 
-#: gajim/history_manager.py:249
-#, fuzzy
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
 "reusable. This operation may take a while."
 msgstr ""
+"Wykonanie tej akcji NIE JEST ZALECANE JEŚLI GAJIM JEST URUCHOMIONY.\n"
 "Standardowo baza danych przechowująca logi rozmów nie zmniejsza swojego "
 "rozmiaru - usunięte elementy zwalniają po prostu miejsce dla nowych danych. "
-"Jeżeli naprawdę chcesz zmniejszyć rozmiar bazy danych kliknij TAK, w "
-"przeciwnym wypadku wybierz NIE.Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
+"To może chwilę potrwać."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Wyczy_ść"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Ty"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o godzinie %(time)s napisał: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Usuń"
 
-#: gajim/history_manager.py:570
-#, fuzzy
+#: gajim/history_manager.py:577
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
-msgstr[0] "Potwierdzenie usunięcia"
-msgstr[1] "Potwierdzenie usunięcia"
-msgstr[2] "Potwierdzenie usunięcia"
+msgstr[0] "Usuń konwersację"
+msgstr[1] "Usuń konwersacje"
+msgstr[2] "Usuń konwersacje"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
-msgstr[0] "Czy na pewno chcesz trwale usunąć rozmowy z <b>%s</b>?"
-msgstr[1] "Czy na pewno chcesz trwale usunąć te rozmowy?"
+msgstr[0] "Czy na pewno chcesz na zawsze usunąć tę rozmowę z <b>%s</b>?"
+msgstr[1] "Czy na pewno chcesz na zawsze usunąć te rozmowy?"
 msgstr[2] ""
 
-#: gajim/history_manager.py:609
-#, fuzzy
+#: gajim/history_manager.py:616
 msgid "Delete Message"
 msgid_plural "Delete Messages"
-msgstr[0] "Domyśla wiadomość"
-msgstr[1] "Domyśla wiadomość"
-msgstr[2] "Domyśla wiadomość"
+msgstr[0] "Usuń wiadomość"
+msgstr[1] "Usuń wiadomości"
+msgstr[2] ""
 
-#: gajim/history_manager.py:610
-#, fuzzy
+#: gajim/history_manager.py:617
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Czy na pewno chcesz usunąć wybraną wiadomość?"
-msgstr[1] "Czy na pewno chcesz usunąć wybrane wiadomości?"
-msgstr[2] "Czy na pewno chcesz usunąć wybrane wiadomości?"
+msgstr[0] "Czy na pewno chcesz na zawsze usunąć tę wiadomość?"
+msgstr[1] "Czy na pewno chcesz na zawsze usunąć te wiadomości?"
+msgstr[2] ""
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
-msgstr ""
-
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+msgstr "Adres XMPP: <i>%s</i>"
+
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Ogólne"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupa"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "W grupie"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Ustaw nastrój"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Żaden"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
-msgstr "Informacja o statusie %s"
+msgstr "Wiadomość dotycząca statusu %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
-msgstr "Opis statusu"
+msgstr "Wiadomość dotycząca statusu"
 
-#: gajim/dialogs.py:700
-#, fuzzy
+#: gajim/dialogs.py:698
 msgid "Overwrite"
-msgstr "Nadpisać?"
+msgstr "Nadpisz"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
-msgstr "Zmienić opis statusu?"
+msgstr "Nadpisać wiadomość dotyczącą statusu?"
 
-#: gajim/dialogs.py:702
-#, fuzzy
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
-msgstr "Status o tej nazwie jest w użyciu. Czy chcesz go zmienić?"
+msgstr "Ta nazwa jest już w użytku. Czy chczesz zmienić ten szablon?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
-#, fuzzy
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
-msgstr "Nadpisać?"
+msgstr "_Nadpisz"
 
-#: gajim/dialogs.py:718
-#, fuzzy
+#: gajim/dialogs.py:716
 msgid "Status Preset"
-msgstr "Opis statusu"
+msgstr "Szablon statusu"
 
-#: gajim/dialogs.py:719
-#, fuzzy
+#: gajim/dialogs.py:717
 msgid "Save status as preset"
-msgstr "Zapisz jako szablon..."
+msgstr "Zapisz status jako szablon"
 
-#: gajim/dialogs.py:720
-#, fuzzy
+#: gajim/dialogs.py:718
 msgid "Please assign a name to this status message preset"
-msgstr "Podaj nazwę dla tego szablonu"
+msgstr "Podaj nazwę dla tego szablonu wiadomości o statusie"
 
-#: gajim/dialogs.py:723
-#, fuzzy
+#: gajim/dialogs.py:721
 msgid "_Save"
-msgstr "Zapisz _jako"
+msgstr "_Zapisz"
 
-#: gajim/dialogs.py:725
-#, fuzzy
+#: gajim/dialogs.py:723
 msgid "New Status"
-msgstr "Status"
+msgstr "Nowy status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
-msgstr "Nie jesteś połączony z serwerem"
+msgstr "Brak połączenia z serwerem"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nazwa"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Serwer"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
-"Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
+"Nie możesz zsynchronizować się z kontem dopóki nie jest ono połączone z "
+"siecią."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "wideo-głosową"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "głosową"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "wideo"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s chce rozpocząć z Tobą rozmowę %(type)s. Chcesz odebrać?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Wyślij plik…"
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
-msgstr "Wyślij Plik (max. %s MiB)"
+msgstr "Wyślij plik (max. %s MiB)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Przesyłane pliki"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 msgid "Invalid XMPP Address"
 msgstr "Niepoprawny adres XMPP"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Wyrzuć %s"
 
-#: gajim/groupchat_control.py:688
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:690
+#, python-format
 msgid "Ban %s"
-msgstr "Lista kontaktów zablokowanych"
+msgstr "Zbanuj %s"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
-#, fuzzy
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 msgid "Voice Request"
-msgstr "Prośba o rozmowę głosową"
+msgstr "Prośba o rozmowę wideo"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
-msgstr ""
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
+msgstr "<b>%(nick)s</b> z <b>%(room_name)s</b> prosi o rozmowę wideo"
 
-#: gajim/groupchat_control.py:834
-#, fuzzy
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
-msgstr "zaakceptowane"
+msgstr "_Zaakceptuj"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s ustawił temat na %(subject)s"
 
-#: gajim/groupchat_control.py:1073
-#, fuzzy
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
-msgstr "Lista zawiera teraz niedostępnych uczestników"
+msgstr "Czat grupowy aktualnie pokazuje niedostępnych uczestników"
 
-#: gajim/groupchat_control.py:1076
-#, fuzzy
+#: gajim/groupchat_control.py:1077
 msgid "Group chat now does not show unavailable members"
-msgstr "lista nie zawiera teraz niedostępnych użytkowników"
+msgstr "Czat grupowy aktualnie nie pokazuje niedostępnych uczestników"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
-msgstr "Ustawienie niezwiązane z prywatnością zostały zmienione."
+msgstr "Ustawienie niezwiązane z prywatnością zostało zmienione"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
-#, fuzzy
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 msgid "Conversations are stored on the server"
-msgstr "Obecna sesja zostanie zachowania w archiwum na serwerze"
+msgstr "Konwersacje są przechowywane na serwerze"
 
-#: gajim/groupchat_control.py:1090
-#, fuzzy
+#: gajim/groupchat_control.py:1091
 msgid "Conversations are not stored on the server"
-msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
+msgstr "Konwersacje nie są przechowywane na serwerze"
 
-#: gajim/groupchat_control.py:1093
-#, fuzzy
+#: gajim/groupchat_control.py:1094
 msgid "Group chat is now non-anonymous"
-msgstr "Pokój nie jest już anonimowy"
+msgstr "Czat grupowy nie jest aktualnie anonimowy"
 
-#: gajim/groupchat_control.py:1097
-#, fuzzy
+#: gajim/groupchat_control.py:1098
 msgid "Group chat is now semi-anonymous"
-msgstr "Pokój jest teraz quasi-anonimowy"
+msgstr "Czat grupowy jest aktualnie wpół-anonimowy"
 
-#: gajim/groupchat_control.py:1101
-#, fuzzy
+#: gajim/groupchat_control.py:1102
 msgid "Group chat is now fully anonymous"
-msgstr "Pokój jest teraz w pełni anonimowy"
+msgstr "Czat grupowy jest aktualnie w pełni anonimowy"
 
 #: gajim/groupchat_control.py:1147
-#, fuzzy, python-format
+#, python-format
 msgid "Ping? (%s)"
-msgstr "Pong! (%s s.)"
+msgstr "Zpingować? (%s)"
 
 #: gajim/groupchat_control.py:1150
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
-msgstr "Pong! (%(nick)s %(delay)s s.)"
+msgstr "Zpingowano! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Błąd."
 
 #: gajim/groupchat_control.py:1238
-#, fuzzy, python-format
+#, python-format
 msgid "You (%s) joined the group chat"
-msgstr "%s dołączył do pokoju"
+msgstr "Dołączyłeś (jako %s) do czatu grupowego"
 
 #: gajim/groupchat_control.py:1243
-#, fuzzy
 msgid "Any participant is allowed to see your full XMPP Address"
-msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
+msgstr "Każdy uczestnik może zobaczyć twój pełny adres XMPP"
 
 #: gajim/groupchat_control.py:1251
-#, fuzzy
 msgid "The server has assigned or modified your nickname in this group chat"
 msgstr ""
-"Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
+"Serwer przypisał Ci lub zmodyfikował Twój pseudonim używany w tym czacie "
+"grupowym"
 
 #: gajim/groupchat_control.py:1261
-#, fuzzy
 msgid "A new group chat has been created"
-msgstr "Został utworzony nowy pokój"
+msgstr "Nowy czat grupowy został utworzony"
 
 #: gajim/groupchat_control.py:1265
-#, fuzzy
 msgid "Failed to Configure Group Chat"
-msgstr "Opuść pokoje"
+msgstr "Nie udało się skonfigurować czatu grupowego"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
-msgstr "Występujesz teraz jako %s"
+msgstr "Występujesz od teraz pod nazwą %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
-msgstr "{nick} występuje teraz jako {new_nick}"
+msgstr "{nick} występuje od teraz pod nazwą {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
-msgstr "Występujesz teraz jako {show}{status}"
+msgstr "Jesteś teraz {show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} ma teraz status {show}{status}"
@@ -1029,194 +957,188 @@ msgstr " przez {actor}"
 #: gajim/groupchat_control.py:1328
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
-msgstr "** Grupa użytkownika została ustawiona na {affiliation}{actor}{reason}"
+msgstr ""
+"** Twoja przynależność została ustawiona na {affiliation}{actor}{reason}"
 
 #: gajim/groupchat_control.py:1334
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
-"** Grupa użytkownika {nick} została ustawiona na {affiliation}{actor}{reason}"
+"** Przynależność użytkownika {nick} została ustawiona na {affiliation}{actor}"
+"{reason}"
 
 #: gajim/groupchat_control.py:1358
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
-msgstr "** Uprawnienia użytkownika zostały zmienione na {role}{actor}{reason}"
+msgstr "** Twoja rola została zmieniona na {role}{actor}{reason}"
 
 #: gajim/groupchat_control.py:1363
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
-msgstr ""
-"** Uprawnienia użytkownika {nick} zostały zmienione na {role}{actor}{reason}"
+msgstr "** Rola użytkownika {nick} została zmieniona na {role}{actor}{reason}"
 
 #: gajim/groupchat_control.py:1386
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "You have been removed from the group chat{actor}{reason}"
-msgstr "Zostałeś wyrzucony z pokoju: {actor}{reason}"
+msgstr "Zostałeś/aś usunięty/a z tego czatu grupowego{actor}{reason}"
 
 #: gajim/groupchat_control.py:1391
 #, python-brace-format
 msgid "You have left due to an error{reason}"
-msgstr "Zostałeś rozłączony z powodu błędu{reason}"
+msgstr "Wyszedłeś/wyszłaś z powodu błędu{reason}"
 
 #: gajim/groupchat_control.py:1397
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
-msgstr "Zostałeś zablokowany{actor}{reason}"
+msgstr "Zostałeś/aś wyrzucony/a{actor}{reason}"
 
 #: gajim/groupchat_control.py:1404
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
-msgstr "Zostałeś zablokowany{actor}{reason}"
+msgstr "Zostałeś/aś zbanowany/a{actor}{reason}"
 
 #: gajim/groupchat_control.py:1411 gajim/groupchat_control.py:1476
-#, fuzzy
 msgid ": Affiliation changed"
-msgstr "afiliacja została zmieniona "
+msgstr ": Przynależność została zmieniona"
 
 #: gajim/groupchat_control.py:1417 gajim/groupchat_control.py:1481
-#, fuzzy
 msgid ": Group chat configuration changed to members-only"
-msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
+msgstr ""
+": Konfiguracja tego czatu grupowego została zmieniona na 'tylko dla członków'"
 
 #: gajim/groupchat_control.py:1445
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "{nick} has been removed from the group chat{by}{reason}"
-msgstr "{nick} został wyrzucony z pokoju: {by}{reason}"
+msgstr "{nick} został(a) usunięty/a z tego czatu grupowego{by}{reason}"
 
 #: gajim/groupchat_control.py:1455
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
-msgstr "{nick} został rozłączony z powodu błędu{reason}"
+msgstr "{nick} wyszedł/wyszła z powodu błędu{reason}"
 
 #: gajim/groupchat_control.py:1461
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
-msgstr "{nick} został wyrzucony: {actor}{reason}"
+msgstr "{nick} został(a) wyrzucony/a{actor}{reason}"
 
 #: gajim/groupchat_control.py:1469
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
-msgstr "{nick} został zabanowany: {actor}{reason}"
+msgstr "{nick} został(a) zabanowany/a{actor}{reason}"
 
 #: gajim/groupchat_control.py:1486
 #, python-brace-format
 msgid "{nick} has left{reason}"
-msgstr "{nick} wyszedł{reason}"
+msgstr "{nick} wyszedł/wyszła{reason}"
 
 #: gajim/groupchat_control.py:1508
 #, python-format
 msgid "%s has joined the group chat"
-msgstr "%s dołączył do pokoju"
+msgstr "%s dołączył(a) do czatu grupowego"
 
 #: gajim/groupchat_control.py:1520
-#, fuzzy
 msgid "Failed to Join Group Chat"
-msgstr "Nie można dołączyć do pokoju"
+msgstr "Nie udało się dołączyć do tego czatu grupowego"
 
 #: gajim/groupchat_control.py:1526
-#, fuzzy
 msgid "Failed to Create Group Chat"
-msgstr "Stwórz rozmowę grupową"
+msgstr "Nie udało się utworzyć nowego czatu grupowego"
 
 #: gajim/groupchat_control.py:1542
-#, fuzzy
 msgid "Group chat has been destroyed"
-msgstr "Pokój został usunięty"
+msgstr "Ten czat grupowy został usunięty"
 
 #: gajim/groupchat_control.py:1547
-#, fuzzy, python-format
+#, python-format
 msgid "You can join this group chat instead: xmpp:%s?join"
-msgstr "W zamian możesz dołączyć do pokoju %s"
+msgstr "Możesz jednak dołączyć do tego czatu grupowego: xmpp:%s?join"
 
 #: gajim/groupchat_control.py:1732
-#, fuzzy
 msgid "Leave Group Chat"
-msgstr "Opuść pokoje"
+msgstr "Opuść czat grupowy"
 
 #: gajim/groupchat_control.py:1733
 msgid "Are you sure you want to leave this group chat?"
-msgstr "Czy jesteś pewien, że chcesz opuścić rozmowę grupową?"
+msgstr "Na pewno chcesz opuścić ten czat grupowy?"
 
 #: gajim/groupchat_control.py:1734
 #, python-format
 msgid "If you close this window, you will leave '%s'."
-msgstr "Zamknięcie tego okna spowoduje opuszczenie rozmowy grupowej '%s'."
+msgstr "Zamknięcie tego okna spowoduje opuszczenie '%s'."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr "_Opuść"
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
+#, python-format
 msgid "%(jid)s has been invited to this group chat"
-msgstr "%(jid)s został zaproszony w tym pokoju"
+msgstr "%(jid)s został(a) zaproszony/a to tego czatu grupowego"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
-msgstr "Pokaż formatowanie tekstu"
+msgstr "Pokaż opcje formatowania tekstu"
 
-#: gajim/chat_control.py:433
-#, fuzzy
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
-msgstr "Ten kontakt nie może przesyłać i odbierać plików."
+msgstr "Ten kontakt nie wspiera HTMLa"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
-msgstr "Ping?"
+msgstr "Zpingować?"
 
-#: gajim/chat_control.py:645
-#, fuzzy, python-format
+#: gajim/chat_control.py:641
+#, python-format
 msgid "Pong! (%s seconds)"
-msgstr "Pong! (%s s.)"
+msgstr "Zpingowano! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s stan : %(state)s, powód: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s z pokoju %(room_name)s"
+msgstr "%(nickname)s z czatu grupowego %(room_name)s"
 
-#: gajim/chat_control.py:1162
-#, fuzzy
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
-msgstr "Włączono szyfrowanie ESession dla tego konta."
+msgstr "Uwaga: Historia rozmów jest wyłączona dla tego kontaktu."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
-msgstr ""
+msgstr "Uwaga: Historia rozmów jest wyłączona dla tego konta."
 
-#: gajim/chat_control.py:1165
-#, fuzzy, python-format
+#: gajim/chat_control.py:1132
+#, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
-msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
+msgstr ""
+"Właśnie otrzymałeś nową wiadomość od %s.\n"
+"Czy chcesz zamknąć tę kartę?"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
-#, fuzzy
 msgid "Close"
-msgstr "_Wyślij i zamknij"
+msgstr "Zamknij"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
-#, fuzzy
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
-msgstr "_Wyślij i zamknij"
+msgstr "_Zamknij"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1225,234 +1147,211 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
-msgstr "%(name)s ma teraz status %(show)s %(status)s"
+msgstr "%(name)s jest teraz %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
-#, fuzzy
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
-msgstr "Przesyłane pliki"
+msgstr "Przesyłanie plików"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Rozmiar"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
-#, fuzzy
 msgid "_Accept"
-msgstr "Akceptuj"
+msgstr "_Akceptuj"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
-#, fuzzy
 msgid "_Decline"
-msgstr "R_ozłączony"
+msgstr "_Odrzuć"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otwórz katalog zawierający ten plik"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
-#, fuzzy
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 msgid "Group Chat Invitation"
-msgstr "Zaproszenie na czat"
+msgstr "Zaproszenie do czatu grupowego"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Druga strona przerwała transfer"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
-msgstr "Błąd odczytu pliku"
+msgstr "Błąd podczas otwierania pliku"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Przesyłanie pliku anulowane"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: gajim/application.py:79
-#, fuzzy
+#: gajim/application.py:80
 msgid "Show the application's version"
-msgstr "Pokaż ikonę w obszarze powiadomienia:"
+msgstr "Pokazuj wersję aplikacji"
 
-#: gajim/application.py:86
-#, fuzzy
+#: gajim/application.py:87
 msgid "Show only critical errors"
-msgstr "Pokaż tylko na liście kontaktów"
+msgstr "Pokazuj tylko błędy krytyczne"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 "Całkowicie odseparuj pliki profilu (nawet historię bazy danych i wtyczek)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
-msgstr "Drukuj zwrotki XML i inne informacje debugowania"
+msgstr "Drukuj XML i inne informacje debugowania"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
-msgstr "Edytor zaawansowanych ustawień"
+msgstr "Użyj profilu zdefiniowanego w folderze konfiguracyjnym"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Ustaw folder konfiguracyjny"
 
-#: gajim/application.py:124
-#, fuzzy
+#: gajim/application.py:125
 msgid "Configure logging system"
-msgstr "Konfiguruj"
+msgstr "Skonfiguruj dziennik zdarzeń"
 
-#: gajim/application.py:132
-#, fuzzy
+#: gajim/application.py:133
 msgid "Show all warnings"
-msgstr "Pokaż wszystkie oczekujące _zdarzenia"
+msgstr "Pokazuj wszystkie ostrzeżenia"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "Otwórz powłokę IPython"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
-msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
+msgstr "Pokazuje okno z następnym oczekującym na akcje wydarzeniem"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
-#, fuzzy
 msgid "Start a new chat"
-msgstr "Rozpocznij rozmowę"
-
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "Symuluj utratę połączenia"
+msgstr "Rozpocznij nową rozmowę"
 
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "Symuluj powrót połączenia"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
-msgstr "Połączone konta"
-
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+msgstr "Złączone konta"
+
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
-#, fuzzy
 msgid "Group chats"
-msgstr "Pokoje"
+msgstr "Czaty grupowe"
 
-#: gajim/roster_window.py:2016
-#, fuzzy
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
-msgstr "Autoryzacja została wysłana"
+msgstr "Wysłano autoryzację"
 
-#: gajim/roster_window.py:2017
-#, fuzzy, python-format
+#: gajim/roster_window.py:2014
+#, python-format
 msgid "\"%s\" will now see your status."
-msgstr "Teraz \"%s\" będzie znał Twój status."
+msgstr "Od teraz \"%s\" będzie widział(a) twój status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
-msgstr "Prośba o autoryzację została wysłana"
+msgstr "Prośba o subskrybcję została wysłana"
 
-#: gajim/roster_window.py:2036
-#, fuzzy, python-format
+#: gajim/roster_window.py:2033
+#, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
-"Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
-"status."
+"Jeśli \"%s\" zaakceptuje tę prośbę, to bedzięsz widział(a) jego/jej status."
 
-#: gajim/roster_window.py:2050
-#, fuzzy
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
-msgstr "Autoryzacja została cofnięta"
+msgstr "Cofnięto autoryzację"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
-msgstr "Teraz \"%s\" zawsze będzie cię widział jako rozłączonego."
+msgstr ""
+"Od teraz \"%s\" będzie ciągle widział(a) Cię jako niedostępnego/niedostępną."
 
 #: gajim/roster_window.py:2268
-#, fuzzy
 msgid "desynced"
-msgstr "rozsynchronizowany"
+msgstr "zdesynchronizowany"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
-msgstr "Zamknij Gajim"
+msgstr "Wyjdź z Gajima"
 
 #: gajim/roster_window.py:2337
 msgid "You are about to quit Gajim"
-msgstr "Zamierzasz zamknąć Gajim"
+msgstr "Zamierzasz wyjść z Gajima"
 
 #: gajim/roster_window.py:2338
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Na pewno chcesz zamknąć Gajim?"
+msgstr "Na pewno chcesz wyjść z Gajima?"
 
 #: gajim/roster_window.py:2339
 msgid "_Always quit when closing Gajim"
-msgstr "_Zawsze zamykaj Gajima"
+msgstr "_Zawsze wychodź z Gajima zamykając go"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
-msgstr "_Zakończ"
+msgstr "_Wyjdź"
 
 #: gajim/roster_window.py:2431
-#, fuzzy
 msgid "Stop File Transfers"
-msgstr "Przesyłane pliki"
+msgstr "Zatrzymaj przesyłanie plików"
 
 #: gajim/roster_window.py:2432
-#, fuzzy
 msgid "You still have running file transfers"
-msgstr "Usuwa transfer pliku"
+msgstr "Parę plików wciąż się przesyła"
 
 #: gajim/roster_window.py:2433
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
-"Jeśli zamkniesz teraz, pobieranie plików zostanie zatrzymane.\n"
-"Czy nadal chcesz zakończyć pracę?"
+"Jeśli wyjdziesz teraz z aplikacji, pobieranie plikó(w) zostanie zatrzymane.\n"
+"Czy nadal chcesz wyjść z aplikacji?"
 
 #: gajim/roster_window.py:2471
 #, fuzzy
@@ -1460,18 +1359,17 @@ msgid "Unread Messages"
 msgstr "Nieprzeczytane wiadomości"
 
 #: gajim/roster_window.py:2472
-#, fuzzy
 msgid "You still have unread messages"
-msgstr "Masz nieprzeczytane wiadomości"
+msgstr "Wciąż masz nieprzeczytane wiadomości"
 
 #: gajim/roster_window.py:2473
-#, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
 "history is enabled and if the contact is in your contact list."
 msgstr ""
-"Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz "
-"włączoną obsługę historii."
+"Wiadomości będą dostępne do odczytania w późniejszym terminie, tylko wtedy, "
+"gdy historia konwersacji jest załączona i użytkownik, z którym się "
+"kontaktujesz jest na Twojej liście kontaktów."
 
 #: gajim/roster_window.py:2733
 msgid "You have unread messages"
@@ -1479,12 +1377,12 @@ msgstr "Masz nieprzeczytane wiadomości"
 
 #: gajim/roster_window.py:2734
 msgid "You must read them before removing this transport."
-msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
+msgstr "Wiadomości muszą zostać przeczytane przed usunięciem tego transportu."
 
 #: gajim/roster_window.py:2737
-#, fuzzy, python-format
+#, python-format
 msgid "Transport '%s' will be removed"
-msgstr "Transport \"%s\" zostanie usunięty"
+msgstr "Transport '%s' zostanie usunięty"
 
 #: gajim/roster_window.py:2738
 #, fuzzy
@@ -1507,7 +1405,7 @@ msgid ""
 "%s"
 msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
-"tego transportu:\n"
+"tych transportów:\n"
 "%s"
 
 #: gajim/roster_window.py:2750
@@ -1515,83 +1413,73 @@ msgid "Remove Transport"
 msgstr "Usuń transport"
 
 #: gajim/roster_window.py:2820
-#, fuzzy
 msgid "Block Contact"
-msgstr "Zablokowane kontakty"
+msgstr "Zablokuj kontakt"
 
 #: gajim/roster_window.py:2821
-#, fuzzy
 msgid "Really block this contact?"
-msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
+msgstr "Na pewno zablokować ten kontakt?"
 
 #: gajim/roster_window.py:2822
-#, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
-"Ten kontakt będzie Cię widział jako rozłączonego. Nie otrzymasz też od niego "
-"żadnych komunikatów."
+"Ten kontakt będzie widział Cię jako niedostępnego/niedostępną, nie będziesz "
+"też otrzymywał(a) od niego żadnych wiadomości."
 
 #: gajim/roster_window.py:2824
-#, fuzzy
 msgid "_Block Contact"
-msgstr "Zablokowane kontakty"
+msgstr "_Zablokuj kontakt"
 
 #: gajim/roster_window.py:2826
-#, fuzzy
 msgid "Block Group"
-msgstr "_Zablokuj"
+msgstr "_Zablokuj grupę"
 
 #: gajim/roster_window.py:2827
-#, fuzzy
 msgid "Really block this group?"
-msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
+msgstr "Na pewno zablokować tę grupę?"
 
 #: gajim/roster_window.py:2828
-#, fuzzy
 msgid ""
 "All contacts of this group will see you as offline and you will not receive "
 "any messages sent to you by any one of these contacts."
 msgstr ""
-"Ten kontakt będzie Cię widział jako rozłączonego. Nie otrzymasz też od niego "
-"żadnych komunikatów."
+"Wszystkie kontakty z tej grupy będą widziały Cię jako niedostępnego/"
+"niedostępną, nie będziesz też otrzymywał(a) od nich żadnych wiadomości."
 
 #: gajim/roster_window.py:2831
-#, fuzzy
 msgid "_Block Group"
-msgstr "_Zablokuj"
+msgstr "_Zablokuj grupę"
 
 #: gajim/roster_window.py:2885
 msgid "Rename Contact"
-msgstr "Zmień nazwę dla kontaktu"
+msgstr "Zmień nazwę kontaktu"
 
 #: gajim/roster_window.py:2886
-#, fuzzy, python-format
+#, python-format
 msgid "Rename contact %s?"
-msgstr "Zmień nazwę dla kontaktu"
+msgstr "Zmienić nazwę dla %s?"
 
 #: gajim/roster_window.py:2887
-#, fuzzy
 msgid "Please enter a new nickname"
-msgstr "_Za pseudonimem:"
+msgstr "Podaj nową nazwę dla kontaktu"
 
 #: gajim/roster_window.py:2894
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
 #: gajim/roster_window.py:2895
-#, fuzzy, python-format
+#, python-format
 msgid "Rename group %s?"
-msgstr "Zmień nazwę grupy"
+msgstr "Zmienić nazwę grupy %s?"
 
 #: gajim/roster_window.py:2896
-#, fuzzy
 msgid "Please enter a new name"
-msgstr "Proszę utworzyć nowy temat i nadać mu nazwę."
+msgstr "Podaj nową nazwę grupy"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "_Zmień nazwę"
@@ -1601,60 +1489,56 @@ msgid "Remove Group"
 msgstr "Usuń grupę"
 
 #: gajim/roster_window.py:2950
-#, fuzzy, python-format
+#, python-format
 msgid "Do you want to remove %s from the contact list?"
-msgstr "Czy chcesz usunąć z rostera grupę %s?"
+msgstr "Chcesz usunąć %s z Twojej listy kontaktów?"
 
 #: gajim/roster_window.py:2951
-#, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
-msgstr "Usuń z rostera wszystkie kontakty należące do tej grupy"
+msgstr "Usuń _także wszystkie kontakty z tej grupy z listy kontaktów"
 
-#: gajim/roster_window.py:3054
-#, fuzzy
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+msgid "Rename Group Chat"
+msgstr "Zmiana nazwy czatu grupowego"
+
+#: gajim/roster_window.py:3045
 msgid "Please enter a new name for this group chat"
-msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
+msgstr "Podaj nową nazwę dla tego czatu grupowego"
 
-#: gajim/roster_window.py:3297
-#, fuzzy
+#: gajim/roster_window.py:3288
 msgid "Remove Contact"
-msgstr "Zmień nazwę dla kontaktu"
+msgstr "Usuń kontakt"
 
-#: gajim/roster_window.py:3298
-#, fuzzy
+#: gajim/roster_window.py:3289
 msgid "Remove contact from contact list"
-msgstr "Usuwa kontakt z listy kontaktów"
+msgstr "Usuń kontakt z listy kontaktów"
 
-#: gajim/roster_window.py:3299
-#, fuzzy, python-format
+#: gajim/roster_window.py:3290
+#, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
-msgstr ""
-"Ty zamierzasz usunąć \"%(name)s\" (%(jid)s) ze swojej listy kontaktów.\n"
+msgstr "Zamierzasz usunąć %(name)s (%(jid)s) z listy kontaktów.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
-#, fuzzy
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr ""
-"Usuwając ten kontakt, usuwasz również autoryzację, która spowoduje, że "
-"zawsze będziesz widoczny jako offline."
+"Usuwając ten kontakt, cofasz mu również autoryzację, oznacza to, że kontakt "
+"ten będzie widział Cię jako niedostępnego/niedostępną."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
-msgstr "Czy chcesz kontynuować?"
+msgstr "Chcesz kontynuować?"
 
-#: gajim/roster_window.py:3330
-#, fuzzy
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
-msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
+msgstr "_Chcę żeby po usunięciu ten kontakt znał mój status"
 
-#: gajim/roster_window.py:3337
-#, fuzzy
+#: gajim/roster_window.py:3328
 msgid "Remove contacts from contact list"
-msgstr "Usuwa kontakt z listy kontaktów"
+msgstr "Usuń kontakty z listy kontaktów"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1662,177 +1546,169 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Usuwając ten kontakt, usuwasz również autoryzację. Oznacza to, że zawsze "
-"będziesz widoczny jako offline.\n"
+"Usuwając te kontakty, cofasz im również autoryzację, oznacza to, że kontakty "
+"te będzą widziały Cię jako niedostępnego/niedostępną:\n"
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3347
-#, fuzzy
+#: gajim/roster_window.py:3338
 msgid "Remove Contacts"
-msgstr "Zmień nazwę dla kontaktu"
+msgstr "Usuń kontakty"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Aby rozmawiać z innymi osobami musisz założyć konto Jabbera."
+msgstr "Aby komunikować się z innymi osobami musisz założyć konto XMPP."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
-msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
+msgstr "Twój serwer nie wspiera przechowywania metakontaktów"
 
-#: gajim/roster_window.py:3965
-#, fuzzy
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
-"Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
-"zostanie przywrócona podczas następnego połączenia."
+"Twój serwer nie wspiera przechowywania informacji o metakontaktach więc "
+"informacje te nie zostaną zapisane przy następnym połączeniu z serwerem."
 
-#: gajim/roster_window.py:4062
-#, fuzzy
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
-msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
+msgstr "Zamierzasz utworzyć metakontakt"
 
-#: gajim/roster_window.py:4063
-#, fuzzy
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
-"Metakontakty są sposobem na zgrupowanie kilku kontaktów w jednej linii "
-"rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont "
-"Jabbera lub zarejestrowana jest w kilku transportach."
+"Metakontakty umożliwiają złączenie kilku kontaktów w jeden. Używa się ich "
+"przede wszystkim wtedy, gdy jedna osoba ma kilka kont XMPP lub "
+"zarejestrowana jest w kilku transportach."
 
-#: gajim/roster_window.py:4067
-#, fuzzy
+#: gajim/roster_window.py:4044
 msgid "Create Metacontact"
-msgstr "Zmień nazwę dla kontaktu"
+msgstr "Utwórz metakontakt"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
-#, fuzzy
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
-msgstr "Twórczy"
+msgstr "_Utwórz"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: gajim/roster_window.py:4202
-#, fuzzy, python-format
+# Plural form 2 is not needed but I don't know how to delete it
+#: gajim/roster_window.py:4179
+#, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
-msgstr[0] "Czy chcesz wysłać ten plik do %s:"
-msgstr[1] "Czy chcesz wysłać te pliki do %s:"
-msgstr[2] "Czy chcesz wysłać te pliki do %s:"
+msgstr[0] "Wyślij ten plik do %s:\n"
+msgstr[1] "Wyślij te pliki do %s:\n"
+msgstr[2] "Wyślij te pliki do %s:\n"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Wyślij %s do %s"
 
-#: gajim/roster_window.py:4373
-#, fuzzy, python-format
+#: gajim/roster_window.py:4350
+#, python-format
 msgid "Make %s first contact"
-msgstr "Przekształć %s oraz %s w metakontakty"
+msgstr "Mianuj %s pierwszym kontaktem"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
-msgstr "_Publikuj Utwór"
+msgstr "_Udostępnij utwór"
 
-#: gajim/roster_window.py:4759
-#, fuzzy
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
-msgstr "_Publikuj Utwór"
+msgstr "_Udostępnij lokalizację"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
-msgstr "Do wszystkich połączonych użytkowników"
+msgstr "Do wszystkich aktualnie dostępnych użytkowników"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Za_proś do"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
-#: gajim/roster_window.py:5060
-#, fuzzy
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
-msgstr "Modyfikuj _grupy"
+msgstr "Edytuj _grupy…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Połącz ponownie"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "_Wykonaj polecenie"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historia"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
-msgstr "Historia rozmów"
+msgstr "Menedżer historii"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
-msgstr ""
+msgstr "Obserwatorzy widzą Twój status ale Ty nie widzisz ich statusu"
 
 #: gajim/conversation_textview.py:63
-#, fuzzy
 msgid "Untrusted"
-msgstr "zainteresowany"
+msgstr "Niezaufany"
 
 #: gajim/conversation_textview.py:66
 msgid "Trust Not Decided"
@@ -1852,8 +1728,8 @@ msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
-"Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju\n"
-"od momentu gdy ostatni raz odwiedziłeś/odwiedziłaś ten pokój"
+"Tekst poniżej tej linii zawiera to, co zostało napisane\n"
+"od momentu gdy ostatni raz odwiedziłeś/odwiedziłaś ten czat grupowy"
 
 #: gajim/conversation_textview.py:518
 msgid "_Quote"
@@ -1866,11 +1742,11 @@ msgstr "_Działania dla wyrażenia \"%s\""
 
 #: gajim/conversation_textview.py:540
 msgid "Read _Wikipedia Article"
-msgstr "Przeczytaj artykuł w _Wikipedii"
+msgstr "Przeczytaj artykuł na _Wikipedii"
 
 #: gajim/conversation_textview.py:545
 msgid "Look it up in _Dictionary"
-msgstr "Szukaj w _słowniku"
+msgstr "Szukaj w _Słowniku"
 
 #: gajim/conversation_textview.py:562
 #, python-format
@@ -1880,7 +1756,7 @@ msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY"
 #: gajim/conversation_textview.py:576
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
-msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
+msgstr "W URL-u do wyszukiwarki internetowej brakuje \"%s\""
 
 #: gajim/conversation_textview.py:579
 msgid "Web _Search for it"
@@ -1891,27 +1767,25 @@ msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
 #: gajim/conversation_textview.py:861
-#, fuzzy
 msgid "Invalid URL"
-msgstr "Niepoprawny JID"
+msgstr "URL jest niepoprawny"
 
 #: gajim/conversation_textview.py:951
 msgid ""
 "<b>Message corrected. Original message:</b>\n"
 "{}"
 msgstr ""
-"<b>Wiadomość poprawiona. Oryginalna wiadomość:</b>\n"
+"<b>Wiadomość została poprawiona. Oryginalna wiadomość:</b>\n"
 "{}"
 
 #: gajim/conversation_textview.py:1119
-#, fuzzy
 msgid "Not encrypted"
-msgstr "Nie włączony"
+msgstr "Nieszyfrowane"
 
 #: gajim/conversation_textview.py:1122
 #, python-format
 msgid "Encrypted (%s)"
-msgstr "Zaszyfrowany (%s)"
+msgstr "Zaszyfrowane (%s)"
 
 #: gajim/conversation_textview.py:1229 gajim/gtk/history.py:618
 #, python-format
@@ -1919,24 +1793,20 @@ msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
 #: gajim/conversation_textview.py:1327
-#, fuzzy
 msgid "Received"
-msgstr "Odebrane %s"
+msgstr "Dostarczono"
 
 #: gajim/message_window.py:361
-#, fuzzy
 msgid "Close Tabs"
-msgstr "Zamknij"
+msgstr "Zamknij karty"
 
 #: gajim/message_window.py:362
-#, fuzzy
 msgid "You are about to close several tabs"
-msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
+msgstr "Zamierzasz zamknąć wiele kart"
 
 #: gajim/message_window.py:363
-#, fuzzy
 msgid "Do you really want to close all of them?"
-msgstr "Czy na pewno chcesz zamknąć wszystkie?"
+msgstr "Na pewno chcesz je wszystkie zamknąć?"
 
 #: gajim/message_window.py:522
 #, fuzzy
@@ -1944,234 +1814,224 @@ msgid "?Noun:Chats"
 msgstr "Czaty"
 
 #: gajim/message_window.py:526
-#, fuzzy
 msgid "Group Chats"
-msgstr "_Pokój"
+msgstr "Czaty grupowe"
 
 #: gajim/message_window.py:530
 msgid "Private Chats"
-msgstr "Rozmowy prywatne"
+msgstr "Czaty prywatne"
 
 #: gajim/message_window.py:536
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: gajim/gui_interface.py:161
-#, fuzzy, python-format
+#: gajim/gui_interface.py:162
+#, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (id: %(id)s)"
+msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (ID: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
-msgstr "Czy akceptujesz tę prośbę?"
+msgstr "Akceptujesz tę prośbę?"
 
-#: gajim/gui_interface.py:168
-#, fuzzy, python-format
+#: gajim/gui_interface.py:169
+#, python-format
 msgid "Do you accept this request (account: %s)?"
-msgstr "Czy akceptujesz tę prośbę na koncie %s?"
+msgstr "Akceptujesz tę prośbę (konto: %s)?"
 
-#: gajim/gui_interface.py:174
-#, fuzzy
+#: gajim/gui_interface.py:175
 msgid "Authorization Request"
-msgstr "Autoryzacja została wysłana"
+msgstr "Prośba o autoryzację"
 
-#: gajim/gui_interface.py:175
-#, fuzzy
+#: gajim/gui_interface.py:176
 msgid "HTTP Authorization Request"
-msgstr "Autoryzacja została wysłana"
+msgstr "Prośba o autoryzację HTTP"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
-#, fuzzy
 msgid "_No"
-msgstr "Żaden"
+msgstr "_Nie"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
-msgstr "Połączenie nie powiodło się"
+msgstr "Połączenie z serwerem nie powiodło się"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
-msgstr "Autoryzacja przyjęta"
+msgstr "Udzielono autoryzacji"
 
-#: gajim/gui_interface.py:343
-#, fuzzy, python-format
+#: gajim/gui_interface.py:317
+#, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
-msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
+msgstr "Kontakt \"%s\" udzielił Ci autoryzacji abyś mógł widzieć jego status."
 
-#: gajim/gui_interface.py:353
-#, fuzzy
+#: gajim/gui_interface.py:327
 msgid "Subscription Removed"
-msgstr "Prośba o autoryzację"
+msgstr "Cofnięto subskrybcję"
 
-#: gajim/gui_interface.py:354
-#, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
-msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
+#: gajim/gui_interface.py:328
+#, python-format
+msgid "%(name)s (%(jid)s) has removed subscription from you"
+msgstr "%(name)s (%(jid)s) cofnął/cofnęła Ci subskrybcję"
 
-#: gajim/gui_interface.py:355
-#, fuzzy
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
-"Zawsze będziesz widział ten kontakt jako rozłączony.\n"
+"Zawsze będziesz widział ten kontakt jako niedostępny.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
-msgstr "Cofnij autoryzację"
+msgstr "Brak subskrybcji"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s odrzucił zaproszenie: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s odrzucił zaproszenie"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
-msgstr "Zostałeś zaproszony do rozmowy grupowej w pokoju {room} przez {user}"
+msgstr "Zostałeś zaproszony do {room} przez {user}"
 
-#: gajim/gui_interface.py:433
-#, fuzzy
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
-msgstr "Certyfikat wygasł"
+msgstr "Ten certyfikat wymaga podania hasła"
 
-#: gajim/gui_interface.py:434
-#, fuzzy, python-format
+#: gajim/gui_interface.py:409
+#, python-format
 msgid "Enter the certificate passphrase for account %s"
-msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
+msgstr "Podaj hasło certyfikatu dla konta %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
-msgstr "Wpisz swoje hasło dla konta %s"
+msgstr "Podaj hasło dla Twojego konta %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
-msgstr "Hasło wymagane"
+msgstr "Hasło jest wymagane"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
-msgstr "%s chce przesłać ci plik."
+msgstr "%s chce Ci przesłać plik."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
-msgstr "Pytanie o przysłanie pliku"
+msgstr "Prośba o przesłanie pliku"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Druga strona przerwała transfer"
 
-#: gajim/gui_interface.py:699
-#, fuzzy
+#: gajim/gui_interface.py:674
 msgid "Error Opening File"
-msgstr "Błąd odczytu pliku"
+msgstr "Wystąpił błąd podczas otwierania pliku"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Błąd certyfikatu SSL"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: gajim/gui_interface.py:726
-#, fuzzy
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
-msgstr "Przesyłane pliki"
+msgstr "Przesyłanie pliku nie powiodło się"
 
-#: gajim/gui_interface.py:749
-#, fuzzy, python-format
+#: gajim/gui_interface.py:724
+#, python-format
 msgid "%(filename)s received from %(name)s."
-msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
+msgstr "Otrzymano plik %(filename)s od %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
+msgstr "Otrzymywanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:760
-#, fuzzy, python-format
+#: gajim/gui_interface.py:735
+#, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
-msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
+msgstr "Wystąpił błąd podczas otrzymywania pliku %(filename)s od %(name)s."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Przesłałeś plik %(filename)s do %(name)s."
+msgstr "Wysłałeś plik %(filename)s do %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:787
-#, fuzzy, python-format
+#: gajim/gui_interface.py:762
+#, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
-msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
+msgstr "Wystąpił błąd podczas wysyłania pliku %(filename)s do %(name)s."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: gajim/gui_interface.py:891
-#, fuzzy
+#: gajim/gui_interface.py:852
 msgid "Please enter a new username for your local account"
-msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
+msgstr "Podaj nową nazwę użytkownika dla Twojego konta lokalnego"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce rozpocząć rozmowę głosową."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Prośba o rozmowę głosową"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: gajim/gui_interface.py:1009
-#, fuzzy, python-format
+#: gajim/gui_interface.py:970
+#, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
 "insecure connection method. This means conversations will not be encrypted. "
@@ -2179,57 +2039,51 @@ msgid ""
 msgstr ""
 "Zamierzasz połączyć się z kontem %(account)s (%(server)s) za pomocą "
 "niezabezpieczonego połączenia. Oznacza to, że konwersacje nie będą "
-"szyfrowane i jest zdecydowanie odradzane. \n"
-"Czy na pewno chcesz to zrobić?"
+"szyfrowane i jest to zdecydowanie odradzane."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
-msgstr ""
+msgstr "_Anuluj"
 
-#: gajim/gui_interface.py:1019
-#, fuzzy
+#: gajim/gui_interface.py:980
 msgid "_Connect Anyway"
-msgstr "Łączę się"
+msgstr "_Połącz się mimo to"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
-msgstr "Nie można zapisać twoich ustawień i opcji"
+msgstr "Nie udało się zapisać zmian w ustwieniach"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr "Gajim: Konsola IPython"
 
 #: gajim/dialog_messages.py:37
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "It is not possible to send a message to %s. This XMPP Address is not valid."
-msgstr "Niemożna wysłać wiadomości do %s, JID jest nieprawidłowy."
+msgstr "Nie można wysłać wiadomości do %s. Ten adres XMPP nie jest prawidłowy."
 
 #: gajim/dialog_messages.py:42
-#, fuzzy
 msgid "Unread Events"
-msgstr "Nieprzeczytane wiadomości"
+msgstr "Nieprzeczytane zdarzenia"
 
 #: gajim/dialog_messages.py:43
-#, fuzzy
 msgid "Read or acknowledge all pending events before removing this account."
 msgstr ""
-"Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
+"Przejrzyj wszystkie zdarzenia oczekujące na akcje przed usunięciem tego "
+"konta."
 
 #: gajim/dialog_messages.py:48
-#, fuzzy
 msgid "Invalid Form"
-msgstr "Niepoprawny pokój"
+msgstr "Niepoprawnie wypełniony formularz"
 
 #: gajim/dialog_messages.py:49
-#, fuzzy
 msgid "The form is not filled correctly."
-msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
+msgstr "Formularz został niepoprawnie wypełniony."
 
 #: gajim/dialog_messages.py:53
-#, fuzzy
 msgid "No Connection Available"
-msgstr "Połączenie jest niedostępne"
+msgstr "Połączenie sieciowe jest niedostępne"
 
 #: gajim/dialog_messages.py:54
 msgid "Your message can not be sent until you are connected."
@@ -2237,14 +2091,15 @@ msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
 #: gajim/dialog_messages.py:58
 msgid "XMPP Address Already in List"
-msgstr ""
+msgstr "Ten adres XMPP już jest na liście"
 
 #: gajim/dialog_messages.py:59
-#, fuzzy
 msgid ""
 "The XMPP Address you entered is already in the list. Please choose another "
 "one."
-msgstr "Wprowadzony JID znajduje się już na liście. Wybierz inny."
+msgstr ""
+"Podany przez Ciebie adres XMPP znajduje się już na Twojej liście. Wybierz "
+"inny adres XMPP"
 
 #: gajim/dialog_messages.py:64
 #, fuzzy
@@ -2255,23 +2110,21 @@ msgstr "Niepoprawna odpowiedź"
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
-"Transport %(name)s udzielił nieprawidłowej odpowiedzi na żądanie "
-"rejestracji: %(error)s"
+"Transport o nazwie %(name)s udzielił nieprawidłowej odpowiedzi na prośbę o "
+"rejestrację: %(error)s"
 
 #: gajim/dialog_messages.py:70
-#, fuzzy
 msgid "Wrong Custom Hostname"
-msgstr "Użyj własnej nazwy hosta/portu"
+msgstr "Nieprawidłowa nazwa hosta"
 
 #: gajim/dialog_messages.py:71
-#, fuzzy, python-format
+#, python-format
 msgid "Custom hostname \"%s\" is wrong. It will be ignored."
-msgstr "Użyj własnej nazwy hosta/portu"
+msgstr "Nazwa hosta \"%s\" jest nieprawidłowa i zostanie zignorowana."
 
 #: gajim/dialog_messages.py:75
-#, fuzzy
 msgid "Error While Removing Privacy List"
-msgstr "Błąd usuwaniu listy prywatności"
+msgstr "Wystąpił błąd podczas usuwania listy prywatności"
 
 #: gajim/dialog_messages.py:76
 #, fuzzy, python-format
@@ -2283,24 +2136,22 @@ msgstr ""
 "jednym z połączonych zasobów. Wyłącz ją i spróbuj ponownie."
 
 #: gajim/dialog_messages.py:82
-#, fuzzy
 msgid "Invisibility Not Supported"
-msgstr "Niewidoczność nie jest obsługiwana"
+msgstr "Niewidzialność nie jest obsługiwana"
 
 #: gajim/dialog_messages.py:83
-#, fuzzy, python-format
+#, python-format
 msgid "This account %s doesn't support invisibility."
-msgstr "Konto %s nie obsługuje niewidoczności."
+msgstr "Konto %s nie obsługuje niewidzialności."
 
 #: gajim/dialog_messages.py:87
-#, fuzzy
 msgid "Registration Succeeded"
-msgstr "Rejestracja zakończyła się sukcesem"
+msgstr "Rejestracja zakończona sukcesem"
 
 #: gajim/dialog_messages.py:88
-#, fuzzy, python-format
+#, python-format
 msgid "Registration with agent %s succeeded."
-msgstr "Rejestracja z %s zakończyła się sukcesem"
+msgstr "Rejestracja na serwerze %s zakończyła się sukcesem."
 
 #: gajim/dialog_messages.py:92
 #, fuzzy
@@ -2312,12 +2163,12 @@ msgstr "Rejestracja nie powiodła się"
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
-"Rejestracja z %(agent)s nie powiodła się, błąd %(error)s: %(error_msg)s"
+"Rejestracja na serwerze %(agent)s nie powiodła się, wystąpił błąd %(error)s: "
+"%(error_msg)s"
 
 #: gajim/dialog_messages.py:98
-#, fuzzy
 msgid "GStreamer Error"
-msgstr "błąd GStreamera"
+msgstr "Błąd GStreamera"
 
 #: gajim/dialog_messages.py:99
 #, python-format
@@ -2404,11 +2255,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Nie jesteś już w pokoju \"%(room)s\" lub \"%(nick)s\" opuścił go."
@@ -2515,10 +2366,10 @@ msgstr ""
 "statusem globalnym"
 
 #: gajim/gajim_remote.py:118
-#, fuzzy
 msgid ""
 "Sends new chat message to a contact in the contact list. Account is optional."
-msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
+msgstr ""
+"Wysyła nową wiadomość do kontaktu z listy kontaktów. Konto jest opcjonalne."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
 #, fuzzy
@@ -2740,28 +2591,23 @@ msgstr ""
 "Argument \"%(arg)s\" nie jest określony. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jest katalogiem choć powinien być plikiem"
 
-#: gajim/common/logger.py:268
-#, fuzzy, python-format
-msgid "Creating %s"
-msgstr "jem"
-
-#: gajim/common/connection_handlers_events.py:73
+#: gajim/common/logger.py:235
 #, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nieznany błąd SSL: %d"
+msgid "Creating %s"
+msgstr "Tworzenie %s"
 
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2769,53 +2615,52 @@ msgstr[0] "Nowa wiadomość od %(nickname)s"
 msgstr[1] "Nowa wiadomość od %(nickname)s"
 msgstr[2] "Nowa wiadomość od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Nowa rozmowa grupowa"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
-#, fuzzy
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 msgid "Authentication failed"
-msgstr "Autoryzacja z \"%s\" nie powiodła się"
+msgstr "Uwierzytelnianie nie powiodło się"
 
 #: gajim/common/config.py:76
 #, fuzzy
@@ -2889,63 +2734,21 @@ msgstr "Pozwól ukryć okno rostera, nawet jeżeli ikona systemowa jest ukryta."
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Powiadom mnie o kontaktach, które się _logują"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Kolor tła dla logujących się kontaktów."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "domyślny"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Język używany przez słownik"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2956,17 +2759,17 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 "Kiedy włączony, emotikony ASCII zostaną przekonwertowane na emotikony "
 "graficzne."
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2975,7 +2778,7 @@ msgstr ""
 "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
 "pogrubiony ale bez usuniętych znaków * *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2984,7 +2787,7 @@ msgstr ""
 "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
 "czat)"
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2993,7 +2796,7 @@ msgstr ""
 "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
 "używany przez innego uzytkownika czatu"
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 #, fuzzy
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
@@ -3002,12 +2805,12 @@ msgstr ""
 "Jeżeli True, Gajim zapisze pozycje rostera podczas jego chowania, oraz "
 "przywróci ją po ponownym wyświetleniu."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 #, fuzzy
 msgid "Place the contact list on the right in single window mode"
 msgstr "Umieść roster po prawej stronie w trybie pojedynczego okna"
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3020,24 +2823,24 @@ msgstr ""
 "minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: "
 "http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Znaki, które wyświetlane są podczas rozmowy przed nazwą użytkownika"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Znaki, które wyświetlane są podczas rozmowy za nazwą użytkownika"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3046,7 +2849,7 @@ msgstr ""
 "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
 "rozmowy zostanie ponownie otwarta."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 #, fuzzy
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
@@ -3054,7 +2857,7 @@ msgstr ""
 "Jak daleko w stecz (w minutach) zostanie odzyskana historia. -1 oznacza brak "
 "limitu."
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3064,19 +2867,19 @@ msgstr ""
 "konferencji, z której zostałeś rozłączony. Wybierz 0 aby wyłączyć ponowne, "
 "automatyczne podłączanie."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
 "zachowanie klienta Mirabilis ICQ)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3085,13 +2888,13 @@ msgstr ""
 "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, "
 "co oznacza użycie wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
 "wykorzystaniem gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3101,15 +2904,15 @@ msgstr ""
 "(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
 "czas nadejścia nowej wiadomości."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr "Pytaj przed wklejeniem obrazu."
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3119,7 +2922,7 @@ msgstr ""
 "pewne dane(rozmowy, prywatne rozmowy, grupowe rozmowy, które nie zostaną "
 "zminimalizowane)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3128,31 +2931,31 @@ msgstr ""
 "Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania "
 "plików, w przypadku tłumaczenia adresu/przekierowania portu."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standard IEC mówi, że KiB = 1024 bajty, KB = 100 bajtów."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Powiadamiaj o zdarzeniach w obszarze powiadamiania."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3161,7 +2964,7 @@ msgstr ""
 "Lista słów oddzielonych średnikami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3172,7 +2975,7 @@ msgstr ""
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 #, fuzzy
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
@@ -3181,17 +2984,7 @@ msgstr ""
 "Jeżeli Prawda, Gajim showa okno rostera po naciśnięciu na przycisk X zamiast "
 "minimalizacji do paska zadań."
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Jeśli ma wartość True, Gajim wyświetli ikonę na każdej karcie zawierającej "
-"nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
-"motywu."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3200,13 +2993,13 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
 "pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Zdefiniuj pozycję avatara na liście kontaktów. Lewo lub prawo"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3215,14 +3008,15 @@ msgstr ""
 "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
 "opisu statusu przez kontakt, z którym rozmawiasz."
 
-#: gajim/common/config.py:213
-#, fuzzy
+#: gajim/common/config.py:191
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
-msgstr "Nie można dołączyć do pokoju"
+msgstr ""
+"Ustawienie domyślne: Pokazuj wiadomości statusu za każdym razem gdy ktoś "
+"dołącza do lub opuszcza czat grupowy."
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
@@ -3231,12 +3025,12 @@ msgstr ""
 "Ustawienie domyślne: Pokazuj status wiadomości dla wszystkich zmian statusów "
 "(Zaraz Wracam, Zajęty itp.) użytkowników w czacie grupowym"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3246,7 +3040,7 @@ msgstr ""
 "niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
 "okna programu."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3268,7 +3062,7 @@ msgstr ""
 "wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
 "uruchomić program."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3281,36 +3075,36 @@ msgstr ""
 "'nigdy' - Nigdy nie pokazuj.\n"
 "'ostatni_stan' - Przywróć ostatni stan"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
 "oknie rozmowy."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu "
 "klawisza ESC."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Ukrywa banner w oknie czatu"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Ukrywa banner w oknie czatu"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Usuwa z okna rozmowy grupowej listę osób obecnych w pokoju."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3319,11 +3113,11 @@ msgstr ""
 "Podczas rozmowy grupowej, pokaż nazwę rozmówcy na początku linii tylko "
 "wówczas, gdy poprzednią wiadomość wysłała inna osoba."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3332,7 +3126,7 @@ msgstr ""
 "Kombinacja klawiszy Ctrl-Tab przechodzi do następnej karty, o ile w żadnej z "
 "nich nie ma nieprzeczytanych wiadomości."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3341,7 +3135,7 @@ msgstr ""
 "Wyświetlać potwierdzenie blokowania kontaktu? Pusta linia oznacza, że "
 "potwierdzenie nie będzie wyświetlane."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3350,7 +3144,7 @@ msgstr ""
 "Wyświetlać potwierdzenie blokowania kontaktu? Pusta linia oznacza, że "
 "potwierdzenie nie będzie wyświetlane."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3362,7 +3156,7 @@ msgstr ""
 "ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
 "serwera."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3372,7 +3166,7 @@ msgstr ""
 "połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
 "grupy"
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3382,13 +3176,13 @@ msgstr ""
 "kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
 "nie jest już otwarte."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Wymagany jest okres nieaktywności zanim zamknięte zostanie okno zmiany "
 "statusu."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3396,11 +3190,7 @@ msgstr ""
 "Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
 "usuwane."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3409,7 +3199,7 @@ msgstr ""
 "Wzorce ważnych uri. Tylko wzorce z tej listy będzie przyjmowane jako "
 "\"prawdziwe\" uri. (mailto i xmpp są traktowane oddzielnie)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3417,19 +3207,19 @@ msgstr ""
 "Jeśli włączony, uzupełnianie w konferencjach będzie działać tak samo, jak w "
 "konsoli."
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3439,17 +3229,17 @@ msgstr ""
 "Jingle. Serwer zostanie wykorzystany z opcji \"stun_server\" lub z ustawień "
 "serwera XMPP."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr "Serwer STUN do wykorzystania podczas korzystania z Jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
@@ -3458,11 +3248,11 @@ msgstr ""
 "Proxy używane do wszystkich połączeń wychodzących, jeżeli konta nie mają "
 "skonfigurowanego konkretnego proxy."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3470,7 +3260,7 @@ msgstr ""
 "Jeżeli włączone, Gajim ponownie otworzy okna czatu, które były otwarte "
 "podczas zamykania Gajima."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3479,12 +3269,7 @@ msgstr ""
 "Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie "
 "użyty opis domyślny."
 
-#: gajim/common/config.py:256
-#, fuzzy
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr "Pokaż mini awatar w zakładce okna czatu i ikonie okna."
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3492,20 +3277,20 @@ msgstr ""
 "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
 "używał Menedżera bazy kluczy GNOME."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 #, fuzzy
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Jeżeli Prawda, Gajim będzie egzekwował komendy XEP-0146"
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: System, 1: Włączony, 0: Wyłączony"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 #, fuzzy
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
@@ -3514,7 +3299,7 @@ msgstr ""
 "Maksymalny okres historii wyrażony w dniach, o który prosimy archiwum pokoju "
 "publicznej. 0: Tyle ile możliwe"
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 #, fuzzy
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
@@ -3523,13 +3308,13 @@ msgstr ""
 "Maksymalny okres historii wyrażony w dniach, o który prosimy archiwum pokoju "
 "prywatnego. 0: Tyle ile możliwe"
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3538,7 +3323,7 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3547,7 +3332,7 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3556,7 +3341,7 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3565,7 +3350,7 @@ msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3574,29 +3359,33 @@ msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
-msgstr ""
+msgstr "Zaznaczenie tekstu skopiuje go do schowka"
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 #, fuzzy
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr "Jeżeli Prawda, Gajim będzie egzekwował komendy XEP-0146"
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "_Dodaj zakładkę do tego pokoju"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3605,7 +3394,7 @@ msgstr ""
 "Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety "
 "zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3616,52 +3405,52 @@ msgstr ""
 "rozmowy, zaraz wracam, nieobecny, nie przeszkadzać, niewidoczny. UWAGA: ta "
 "opcja będzie używana tylko jeśli restore_last_status będzie wyłączone"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Jeśli włączone, przywróc ostatni status, który był użyty."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr "Jeśli włączony, pytania o autoryzację będą automatycznie akceptowane."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "Wyłącznie opcji wyłączy konto i ukryje je w oknie kontaktów."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
-msgstr ""
+msgstr "Lista błędów SSL do zignorowania (oddzielone spacją)."
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3670,7 +3459,7 @@ msgstr ""
 "Czas oczekiwania (w sekundach) na odpowiedź na pakiet podtrzymujący "
 "połączenie przed podjęciem próby ponownego połączenia."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3679,20 +3468,20 @@ msgstr ""
 "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza "
 "file_transfers_proxies i użyje ich podczas przesyłania plików."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie "
 "użyty opis domyślny."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3700,17 +3489,16 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/common/config.py:342
-#, fuzzy
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
-msgstr "%s chce przesłać ci plik."
+msgstr "Pozwól Gajimowi na wysyłanie Twojego czasu lokalnego."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Wiadomość wysyłana do kontaktów, które chcesz dodać"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3719,28 +3507,24 @@ msgstr ""
 "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza "
 "file_transfers_proxies i użyje ich podczas przesyłania plików."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Zezwól na weryfikacji certyfikatu POSH"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3749,17 +3533,17 @@ msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Aktywne szyfrowanie dla tego kontaktu"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
@@ -3768,24 +3552,25 @@ msgstr ""
 "Ustawienie domyślne: Pokazuj status wiadomości dla wszystkich zmian statusów "
 "(Zaraz Wracam, Zajęty itp.) użytkowników w czacie grupowym"
 
-#: gajim/common/config.py:388
-#, fuzzy
+#: gajim/common/config.py:365
 msgid "Show a status message for every join or leave in a group chat."
-msgstr "Nie można dołączyć do pokoju"
+msgstr ""
+"Pokazuj wiadomości statusu za każdym razem gdy ktoś dołącza do lub opuszcza "
+"czat grupowy."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3794,91 +3579,91 @@ msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Pracuję."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Praca"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3888,1060 +3673,1057 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Dźwięk, jaki będzie odtwarzany, gdy nadejdzie wiadomość MUC."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Do"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Pokoje"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Zaproszenie na czat"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Zaproszenie na czat"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Pokój"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Pokoje"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Nowa rozmowa grupowa"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Nie można odnaleźć usługi"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "To nie jest czat"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: gajim/common/const.py:272
-#, fuzzy
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
-msgstr "Pokój <b>%s</b> nie istnieje."
+msgstr "Ten czat grupowy nie istnieje"
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Pokoje"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Krzątam się"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Na zakupach"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Sprzątam"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Gotuję"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Naprawiam"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Zmywam naczynia"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Piorę"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Pracuję w ogrodzie"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Biegam na posyłki"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Wyprowadzam psa"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Piję"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Piję piwo"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Piję kawę"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Piję herbatę"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Coś  przegryzam"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Jem śniadanie"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Jem obiad"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Jem lunch"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Ćwiczę"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Jeżdżę na rowerze"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Tańczę"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Wspinam się"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Jogging"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Uprawiam sport"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Biegam"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Na nartach"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Pływam"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Wyciskam"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Dbam o urodę"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "W salonie Spa"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Myję zęby"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "U fryzjera"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Golę się"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Biorę kąpiel"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Biorę prysznic"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Na spotkaniu"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Dzień wolny"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Wałęsam się"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Ukrywam się"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Na wakacjach"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Modlę się"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Zaplanowane wakacje"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Myślę"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Odpoczywam"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Łowię ryby"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Gram"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Wychodzę"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Imprezuję"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Czytam"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Na próbie"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Na zakupach"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Palę"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Udzielam się towarzysko"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Opalam się"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Oglądam TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Oglądam film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Rozmawiam"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "W rzeczywistości"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Rozmawiam przez telefon"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Wideokonferencja"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "W podróży"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "W drodze do pracy"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Prowadzę samochód"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "W samochodzie"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "W autobusie"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "W samolocie"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "W pociągu"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Na wyciecze"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Spaceruję"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programuję"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "Na spotkaniu"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Uczę się"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Piszę"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Przestraszony"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Zadziwiony"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Kochliwy"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Zły"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Zirytowany"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Niespokojny"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Podniecony"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Zawstydzony"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Znudzony"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Odważny"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Spokojny"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Ostrożny"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Zziębnięty"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Pewny siebie"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Zmieszany"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Zamyślony"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Zadowolony"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Nawiedzony"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Szalony"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Twórczy"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Ciekawy"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Ponury"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Zdołowany"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Rozczarowany"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Zniesmaczony"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Zaniepokojony"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Roztargniony"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Zawstydzony"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Zawistny"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Podekscytowany"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Flirciarski"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Sfrustrowany"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Wdzięczny"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Zasmucony"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Marudny"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Winny"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Wesoły"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Pełen nadziei"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Gorący"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Upokorzony"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Poniżony"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Głodny"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Zraniony"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "pod wrażeniem"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Bojaźliwy"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Zakochany"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Oburzony"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "zainteresowany"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Odurzony"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Niepokonany"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Zazdrosny"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Samotny"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Zagubiony"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Szczęśliwy"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Okrutny"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Markotny"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nerwowy"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Obrażony"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Znieważony"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Filuterny"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Dumny"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Odprężony"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Podniesiony na duchu"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Skruszony"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Niespokojny"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Smutny"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarkastyczny"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Zadowolony"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Poważny"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Wstrząśnięty"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Nieśmiały"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Chory"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Senny"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Żywiołowy"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Zestresowany"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Silny"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Zaskoczony"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Wdzięczny"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Spragniony"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Zmęczony"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Słaby"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Zmartwiony"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "dokładność"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "domyślny"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "morski"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Ukrywam się"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Kraj:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Opis"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Błąd"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "region"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "pierwsza"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "kod pocztowy"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "region"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "pokój"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "prędkość"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "ulica"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "tekst"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr "Adres URIURI"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Nie można uzyskać certyfikatu wystawcy"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Nie można uzyskać CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nie można odszyfrować podpisu certyfikatu"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nie można odszyfrować podpisu CRL"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Nie można odkodować klucza publicznego wystawcy"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Błąd podpisu certyfikatu"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Błąd podpisu CRL"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Certyfikat nie jest prawidłowy"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Certyfikat wygasł"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL nie jest prawidłowy"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL wygasł"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Błąd w polu notBefore certyfikatu"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Błąd w polu notAfter certyfikatu"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Błąd w polu lastUpdate CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Błąd w polu nextUpdate CRL"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Certyfikat podpisany przez wystawcę"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "W łańcuchu certyfikatów znaleziono certyfikat podpisany przez wystawcę"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Nie można pobrać lokalnego certyfikatu wystawcy"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Nie można zweryfikować pierwszego certyfikatu"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Za długi łańcuch certyfikatów"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Niepoprawny certyfikat CA"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Stała długości ścieżki przekroczona"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Nieznany cel certyfikatu"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certyfikat niezaufany"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certyfikat odrzucony"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Niezgodność subject/issuer"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Tym kluczem nie można podpisywać certyfikatu"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
-#, fuzzy
+#: gajim/common/const.py:889
 msgid "Unknown validation error"
-msgstr "Nieznany błąd SSL: %d"
+msgstr "Nieznany błąd walidacyjny"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Certyfikat wygasł"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autoryzacja przyjęta"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Konto jest wyłączone"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Certyfikat wygasł"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Szyfrowanie E2E włączone"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: gajim/common/const.py:909
-#, fuzzy
+#: gajim/common/const.py:942
 msgid "Authentication mechanism too weak"
-msgstr "Autoryzacja z \"%s\" nie powiodła się"
+msgstr "Mechanizm uwierzytelniania jest za słaby"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -5004,12 +4786,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s błąd konfiguracji"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -5028,223 +4810,190 @@ msgstr ""
 "Błąd:\n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "wejście dźwięku"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "wyjście dźwięku"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "wejście wideo"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Serwer winien mieć od 1 do 1023 znaków"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Niepoprawna litera w nazwie hosta."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Wymagany adres serwera."
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Nazwa użytkownika winna mieć od 1 do 1023 znaków"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Niepoprawna litera w nazwie użytkownika."
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "Zasób winien mieć od 1 do 1023 znaków"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Niepoprawna litera w zasobach."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Zajęty"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Nieobecny"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "?user status:_Dostępny"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "?user status:Dostępny"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Zaraz wracam"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Do"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Obustronna"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Goście"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Gość"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Właściciel"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Właściciel"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Uczestnik"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Uczestnik"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "pisze wiadomość..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5252,22 +5001,22 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: gajim/common/helpers.py:929
-#, fuzzy, python-format
+#: gajim/common/helpers.py:749
+#, python-format
 msgid "from group chat %s"
-msgstr "w _konferencji"
+msgstr "z czatu grupowego %s"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od użytkownika %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5275,50 +5024,39 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Cześć, jestem $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Obraz jest za duży"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nie jest prawidłowy"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jest plikiem choć powinien być katalogiem"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
@@ -5340,22 +5078,22 @@ msgstr ""
 "False"
 
 #: gajim/common/exceptions.py:81
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Session bus is not available.\n"
 "Try reading %(url)s"
 msgstr ""
 "Nie znaleziono interfejsu DBus.\n"
-"Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
+"Zapoznaj się z uwagami na stronie %(url)s"
 
 #: gajim/common/exceptions.py:93
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "System bus is not available.\n"
 "Try reading %(url)s"
 msgstr ""
 "Nie znaleziono interfejsu DBus.\n"
-"Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
+"Zapoznaj się z uwagami na stronie %(url)s"
 
 #: gajim/common/zeroconf/connection_zeroconf.py:251
 #, python-format
@@ -5422,85 +5160,85 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Plik nie istnieje."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 #, fuzzy
 msgid "Requesting HTTP File Upload Slot…"
 msgstr "Wgrywanie pliku przez http..."
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 #, fuzzy
 msgid "Uploading via HTTP File Upload…"
 msgstr "Wgrywanie pliku przez http..."
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Zmień informację o statusie"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Zmień status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Ustaw typ widoczności i status opisowy"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Chętny do rozmowy"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Dostępny"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Nieobecny"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Nie przeszkadzać."
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Nieobecny - rozłączony"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Status opisowy"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Status został zmieniony."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Wysłany kontakt: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Wyślij kontakty:"
 
@@ -5523,7 +5261,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Konto"
 
@@ -5534,7 +5272,7 @@ msgstr "Pokoje"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Hasło:"
@@ -5558,7 +5296,7 @@ msgstr "w _konferencji"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Dołącz"
@@ -5577,17 +5315,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -5644,9 +5382,8 @@ msgid "Personal"
 msgstr "Informacje osobiste"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:62
-#, fuzzy
 msgid "Idle since:"
-msgstr "Bezczynny od %s"
+msgstr "Konto nieaktywne od:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:88
 msgid "Mood:"
@@ -5735,7 +5472,7 @@ msgstr "Informacje o kontakcie"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Opis"
 
@@ -5936,40 +5673,44 @@ msgstr "Praca"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Informacje"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Dołącz do pokoju"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Niedługo wrócę"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
-#, fuzzy
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
-msgstr "Usuwanie konta %s"
+msgstr "Wybierz konto"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "Sprzątam"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -6039,6 +5780,7 @@ msgid "Strike"
 msgstr "Przekreślenie"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Kolor"
 
@@ -6051,138 +5793,128 @@ msgstr "Czcionka:"
 msgid "Clear formatting"
 msgstr "Usuń formatowanie"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Wybierz plik do wysłania..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Blokuję użytkownika..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "_Za pseudonimem:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Zmień pseudo_nim..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Zmień temat"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Wpisz nowe hasło:"
 
-#: gajim/data/gui/groupchat_control.ui:958
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1003
 msgid "_Leave Group Chat"
-msgstr "Opuść pokoje"
+msgstr "_Opuść czat grupowy"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Zaznaczenie spowoduje łączenie z tym pokojem przy starcie programu"
 
-#: gajim/data/gui/groupchat_control.ui:1018
-#, fuzzy
-msgid "An error occured"
-msgstr "<b>Wystąpił błąd:</b>"
+#: gajim/data/gui/groupchat_control.ui:1063
+msgid "An error occurred"
+msgstr "Wystąpił błąd"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Ponowna weryfikacja..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Uczestnik"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "Wy_rzuć"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Uczestnik"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "Za_banuj"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: gajim/data/gui/groupchat_control.ui:1521
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1566
 msgid "_Destroy"
-msgstr "Usuwam pokój %s"
+msgstr "_Usuń"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Powód"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
-msgstr "Wpisz nową nazwę dla grupy %s."
+msgstr "Podaj nową nazwę dla tego czatu grupowego"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "_Zaproś"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Typ zdarzenia"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Opis zdarzenia"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6278,20 +6010,20 @@ msgid "Add"
 msgstr "Dodaj"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Usuń"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Zasoby:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6301,7 +6033,7 @@ msgid "Client"
 msgstr "Klient:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "System"
 
@@ -6397,14 +6129,12 @@ msgid "All status messages"
 msgstr "informacja o statusie"
 
 #: gajim/data/gui/preferences_window.ui:98
-#, fuzzy
 msgid "Only enter/leave messages"
-msgstr "W każdej _wiadomości"
+msgstr "Tylko wiadomości dołączył(a)/opuścił(a)"
 
 #: gajim/data/gui/preferences_window.ui:126
-#, fuzzy
 msgid "Last state"
-msgstr "Ostatni status %s"
+msgstr "Ostatni status"
 
 #: gajim/data/gui/preferences_window.ui:166
 msgid "Only when pending events"
@@ -6438,38 +6168,39 @@ msgstr "_Zachowanie okna:"
 msgid "_Show contact list on startup"
 msgstr "Pokaż _listę kontaktów"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr "Pokaż _awatar w zakładce czatu"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Połącz konta"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6478,12 +6209,12 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Wyświetlaj _opisy statusu kontaktu na liście kontaktów"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6492,53 +6223,53 @@ msgstr ""
 "Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
 "jego nazwą na liście kontaktów"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Wyświetlaj nastroje kontaktów z listy"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Wyślij kontakty:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "w _konferencji"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Kontakt rozłączył się"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Słownik"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6550,29 +6281,29 @@ msgstr ""
 "w oknach rozmów. Jeżeli nie wskazano konkrentego słownika, program użyje "
 "słownika domyślnego."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "zawartość wiadomości"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Pokaż formatowanie tekstu"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Wyświetlaj _opisy statusu kontaktu na liście kontaktów"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6581,58 +6312,61 @@ msgstr ""
 "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
 "opisu statusu przez kontakt, z którym rozmawiasz."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Wtyczki"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
-msgstr ""
+msgstr "Pokazuj dołączył(a)/opuścił(a) (Domyślnie)"
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
+"Ustawienie decydujące o tym czy wiadomości statusu o dołączeniu/opuszczeniu "
+"czatu są wyświetlane w czacie grupowym, można to zmienić z poziomu menu "
+"czatu grupowego."
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6641,66 +6375,68 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
+"używasz"
 
-#: gajim/data/gui/preferences_window.ui:940
-#, fuzzy
+#: gajim/data/gui/preferences_window.ui:938
 msgid "Chatstate"
-msgstr "Ostatni status %s"
+msgstr "Status na czacie"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Rozmowa"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Pokaż ikonę w obszarze powiadomienia:"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
 "niewidoczny"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
 "niewidoczny"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Powiadom mnie o kontaktach, które się _logują"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6709,49 +6445,49 @@ msgstr ""
 "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
 "prawym dolnym rogu ekranu"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Powiadomienia wizualne"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Za_rządzaj..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Włącz dźwięki, kiedy jestem _zajęty"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Dźwięki w Wav"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Nieobecny"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6760,7 +6496,7 @@ msgstr ""
 "Użycie tej opcji oznacza, że Gajim zmieni status na Niedostępny po dłuższym "
 "okresie bezczynności"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6769,7 +6505,7 @@ msgstr ""
 "Użycie tej opcji oznacza, że Gajim zmieni status na Niedostępny po dłuższym "
 "okresie bezczynności"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6782,7 +6518,7 @@ msgstr ""
 "$S będzie zastąpione przez poprzedni opis statusu\n"
 "$T będzie zastąpione przez czas, który jesteś nieaktywny"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6796,40 +6532,40 @@ msgstr ""
 "$T będzie zastąpione przez czas, po którym ma zostać ustawiono status "
 "\"Nieobecny\""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutach"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatyczny status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Pytaj o opis przy zmianie statusu na:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6837,67 +6573,67 @@ msgstr ""
 "Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie "
 "użyty opis domyślny."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Domyśla wiadomość"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Włączone"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Opis statusu"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Zapisane opisy"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Motyw"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Motyw"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Konfiguruj kolor i czcionkę interfejsu"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Zestaw ikon _statusu:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6907,75 +6643,75 @@ msgstr ""
 "transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
 "dostępny, zaraz wracam, zajęty, itd"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Styl"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Możliwości programu"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Wyjście audio"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Wejście audio"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Test audio"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Video test"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Wejście video"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "wyjście wideo"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Klatek na sekundę"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Rozmiar obrazu"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 #, fuzzy
 msgid "Vi_ew own video source"
 msgstr "Zobacz własne  źródło filmu"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Połączenie"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Serwer STUN:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -6984,57 +6720,66 @@ msgstr ""
 "Nazwa hosta serwera STUN. Jeśli nie podano żadnej,\n"
 "Gajim spróbuje odnaleźć ją na serwerze."
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Audio / Video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 #, fuzzy
 msgid "_Global proxy"
 msgstr "Globalne proxy:"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "Zarządzaj..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Otwórz..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Edytor zaawansowanych ustawień"
 
 #: gajim/data/gui/groupchat_config.ui:55
-#, fuzzy
 msgid ""
 "<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
@@ -7043,11 +6788,11 @@ msgid ""
 "&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/"
 "resource)\n"
 msgstr ""
-"<b>Jabber-ID</b>\n"
+"<b>Adres XMPP</b>\n"
 "&lt;user@domain/resource&gt; (dotyczy tylko tego zasobu)\n"
 "&lt;user@domain&gt; (dotyczy dowolnego zasobu)\n"
 "&lt;domain/resource&gt; (dotyczy tylko tego zasobu)\n"
-"&lt;domain&gt; (dotyczy domeny a także dowolnego adresu typu "
+"&lt;domain&gt; (dotyczy domeny, a także dowolnego adresu typu "
 "użytkownik@domena lub domena/zasób)\n"
 
 #: gajim/data/gui/groupchat_config.ui:132
@@ -7212,12 +6957,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Wpisz nowe hasło:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Opcje zaawansowane"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Użyj własnej nazwy hosta/portu"
@@ -7304,7 +7049,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Połączony"
@@ -7318,7 +7063,7 @@ msgstr "Proszę utworzyć nowy temat i nadać mu nazwę."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7347,8 +7092,8 @@ msgstr "Wróć do kolorów _domyślnych"
 msgid "Resets value to default"
 msgstr "Wróć do kolorów _domyślnych"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Nazwa hosta: "
@@ -7359,9 +7104,8 @@ msgid "Server Software"
 msgstr "Możliwości serwerów"
 
 #: gajim/data/gui/server_info.ui:80
-#, fuzzy
 msgid "Server Uptime"
-msgstr "Serwer odpowiedział: %s"
+msgstr "Czas pracy serwera"
 
 #: gajim/data/gui/server_info.ui:109
 #, fuzzy
@@ -7392,7 +7136,7 @@ msgstr "Pokaż certyfikat..."
 msgid "Proxy Host"
 msgstr "_Serwer Proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Typ"
 
@@ -7406,8 +7150,7 @@ msgstr "P_rotokół:"
 msgid "Copy info to clipboard"
 msgstr "_Kopiuj adres odnośnika"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Możliwości programu"
 
@@ -7450,11 +7193,8 @@ msgid "<error>"
 msgstr "Błąd"
 
 #: gajim/data/gui/ssl_error_dialog.ui:74
-#, fuzzy
 msgid "Add this certificate to the list of _trusted certificates"
-msgstr ""
-"Dodaj ten certyfikat do listy zaufanych.\n"
-"Odcisk klucza SHA1 tego certyfikatu:\n"
+msgstr "Dodaj ten certyfikat do listy zaufanych certyfikatów"
 
 #: gajim/data/gui/ssl_error_dialog.ui:92
 #, fuzzy
@@ -7593,6 +7333,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Zmień opis statusu"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Nastrój</b>"
@@ -7670,8 +7415,8 @@ msgstr "Zainstalowany"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7858,78 +7603,106 @@ msgstr "Wtyczki"
 msgid "_Name"
 msgstr "_Nazwa: "
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Serwer Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Rozpocznij rozmowę"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
-msgid "Create Group Chat"
+#, fuzzy
+msgid "Create _Group Chat…"
 msgstr "Stwórz rozmowę grupową"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Historia rozmów"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Wtyczki"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Ustawienia"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Zakończ"
+msgid "_Accounts"
+msgstr "Konta"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Widok"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Pokaż kontakty _połączone"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
+#, fuzzy
+msgid "Show _Offline Contacts"
 msgstr "Pokaż niedostępne kontakty"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Pokaż kontakty _połączone"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Pokaż trans_porty"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Konsola XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Przesyłane pliki"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Pomoc"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Dostępny"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Dostępny"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Możliwości programu"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Informacje"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7944,6 +7717,10 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+msgid "Create Group Chat"
+msgstr "Stwórz rozmowę grupową"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -7978,13 +7755,12 @@ msgid "_Deny"
 msgstr "O_dmów"
 
 #: gajim/data/gui/subscription_request_window.ui:153
-#, fuzzy
 msgid ""
 "Deny authorization from contact so the contact cannot know if you are "
 "connected"
 msgstr ""
 "Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś "
-"połączony"
+"dostępny(a)"
 
 #: gajim/data/gui/subscription_request_window.ui:165
 #, fuzzy
@@ -8178,9 +7954,8 @@ msgid "Scroll down"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:100
-#, fuzzy
 msgid "Clear chat window"
-msgstr "Użycie: /%s czyście okno tekstowe."
+msgstr "Wyczyść okno czatu"
 
 #: gajim/data/gui/shortcuts_window.ui:107
 #, fuzzy
@@ -8234,58 +8009,66 @@ msgstr "Kontakt rozłączył się"
 msgid "Create new group chat"
 msgstr "Stwórz rozmowę grupową"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Ustawienia"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Przesyłane pliki"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "informacja o statusie"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Konsola _XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Wygląd"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Wyświetlanie kontaktów offline"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Pokaż kontakty _połączone"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Pokaż kontakty _połączone"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Informacje o kontakcie"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Wyślij kontakty:"
@@ -8340,9 +8123,8 @@ msgid "Search contacts..."
 msgstr "_Szukaj w bazie"
 
 #: gajim/data/gui/groupchat_invite.ui:223
-#, fuzzy
 msgid "Click on contacts you would like to invite to this group chat."
-msgstr "%(jid)s został zaproszony w tym pokoju"
+msgstr "Kliknij na kontakty, które chcesz zaprosić do tego czatu grupowego."
 
 #: gajim/data/gui/manage_pep_services_window.ui:46
 #, fuzzy
@@ -8362,12 +8144,16 @@ msgstr "Wypełnij formularz."
 msgid "Group Chat Configuration"
 msgstr "Zaproszenie na czat"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Konsola XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Rozpocznij rozmowę"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "Filtr:"
 
@@ -8411,11 +8197,6 @@ msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 msgid "Mute Sounds"
 msgstr "Wyłącz dźwięki"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Ustawienia"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8511,9 +8292,8 @@ msgid ""
 msgstr ""
 
 #: gajim/command_system/implementation/standard.py:81
-#, fuzzy
 msgid "Send a message to the contact"
-msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
+msgstr "Wyślij wiadomość do kontaktu"
 
 #: gajim/command_system/implementation/standard.py:86
 msgid "Send action (in the third person) to the current chat"
@@ -8563,15 +8343,13 @@ msgstr "Dostępny"
 
 #: gajim/command_system/implementation/standard.py:183
 #: gajim/command_system/implementation/standard.py:264
-#, fuzzy
 msgid "Clear the text window"
-msgstr "Użycie: /%s czyście okno tekstowe."
+msgstr "Wyczyść okno tekstowe"
 
 #: gajim/command_system/implementation/standard.py:188
 #: gajim/command_system/implementation/standard.py:417
-#, fuzzy
 msgid "Send a ping to the contact"
-msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
+msgstr "Wyślij sygnał ping do kontaktu"
 
 #: gajim/command_system/implementation/standard.py:192
 #: gajim/command_system/implementation/standard.py:421
@@ -8613,9 +8391,8 @@ msgid "Video chats are not available"
 msgstr "Połączenie jest niedostępne"
 
 #: gajim/command_system/implementation/standard.py:229
-#, fuzzy
 msgid "Send a message to the contact that will attract their attention"
-msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
+msgstr "Wyślij wiadomość do kontaktu aby zwrócił na Ciebie uwagę"
 
 #: gajim/command_system/implementation/standard.py:269
 #, fuzzy
@@ -8636,9 +8413,8 @@ msgstr "Otwiera okno prywatnej rozmowy z tą osobą."
 #: gajim/command_system/implementation/standard.py:352
 #: gajim/command_system/implementation/standard.py:365
 #: gajim/command_system/implementation/standard.py:377
-#, fuzzy
 msgid "Nickname not found"
-msgstr "Pseudonim nie został odnaleziony: %s"
+msgstr "Nazwa użytkownika nie została znaleziona"
 
 #: gajim/command_system/implementation/standard.py:290
 #, fuzzy
@@ -8657,9 +8433,9 @@ msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
 #: gajim/command_system/implementation/standard.py:312
-#, fuzzy, python-format
+#, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
-msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
+msgstr "Zaproszono %(jid)s do %(room_jid)s"
 
 #: gajim/command_system/implementation/standard.py:317
 #, fuzzy
@@ -8670,6 +8446,7 @@ msgstr "w _konferencji"
 msgid ""
 "Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
+"Opuść czat grupowy, opcjonalnie podając powód i zamknij kartę lub okno."
 
 #: gajim/command_system/implementation/standard.py:333
 msgid ""
@@ -8686,18 +8463,14 @@ msgid "Kick user from group chat by nickname"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
 #: gajim/command_system/implementation/standard.py:358
-#, fuzzy
 msgid ""
 "Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
-"\n"
-"    Ustaw obecny status\n"
-"\n"
-"    Status może otrzymać następujące wartości:\n"
-"    online, away, chat, xa, dnd.\n"
-"    "
+"Ustal role uczestników w czacie grupowym.\n"
+"    Można ustawić rolę na jedną z podanych:\n"
+"    moderator,uczestnik,gość,brak"
 
 #: gajim/command_system/implementation/standard.py:363
 #, fuzzy
@@ -8705,18 +8478,14 @@ msgid "Invalid role given"
 msgstr "Niepoprawna nazwa serwera"
 
 #: gajim/command_system/implementation/standard.py:370
-#, fuzzy
 msgid ""
 "Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
-"\n"
-"    Ustaw obecny status\n"
-"\n"
-"    Status może otrzymać następujące wartości:\n"
-"    online, away, chat, xa, dnd.\n"
-"    "
+"Ustaw przynależność uczestnika czatu grupowego.\n"
+"    Przynależność może przyjąć jedną z podanych wartości:\n"
+"    właściciel, administrator, uczestnik, wyrzutek, brak"
 
 #: gajim/command_system/implementation/standard.py:375
 #, fuzzy
@@ -8724,9 +8493,8 @@ msgid "Invalid affiliation given"
 msgstr "afiliacja została zmieniona "
 
 #: gajim/command_system/implementation/standard.py:385
-#, fuzzy
 msgid "Display names of all group chat participants"
-msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
+msgstr "Wyświetlaj nazwy wszystkich uczestników czatu grupowego"
 
 #: gajim/command_system/implementation/standard.py:407
 msgid "Forbid a participant to send you public or private messages"
@@ -8745,133 +8513,132 @@ msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
 #: gajim/gtk/filetransfer_progress.py:104
-#, fuzzy, python-format
+#, python-format
 msgid "%(progress)s of %(total)s"
-msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
+msgstr "%(progress)s z %(total)s"
 
 #: gajim/gtk/filetransfer_progress.py:121
 #, python-format
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: gajim/gtk/groupchat_info.py:39
-#, fuzzy
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
-msgstr "%s dołączył do pokoju"
+msgstr "Każdy może dołączyć do tego czatu grupowego"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Pokoje"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Pokoje"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Ten pokój nie ma tematu"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Pokoje"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Pokoje"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Pokoje"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Zaproszenie na czat"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Obecna sesja zostanie zachowania w archiwum na serwerze"
@@ -8900,7 +8667,7 @@ msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
@@ -8934,15 +8701,15 @@ msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
 #: gajim/gtk/filetransfer.py:335
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The file %s has been received, but it seems to have been damaged along the "
 "way.\n"
 "Do you want to download it again?"
 msgstr ""
-"Plik %(file)s został odebrany, ale wydaje się, że został uszkodzony po "
-"drodze. \n"
-"Czy chcesz go ponownie pobrać?"
+"Plik %s został odebrany, ale wygląda na to, że został uszkodzony podczas "
+"pobierania.\n"
+"Czy chcesz pobrać go ponownie?"
 
 #: gajim/gtk/filetransfer.py:341
 #, fuzzy
@@ -9053,7 +8820,7 @@ msgstr "Plik: "
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Nadawca: "
 
@@ -9067,7 +8834,7 @@ msgid "Change"
 msgstr "Zmień pseudo_nim..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Niedługo wrócę"
@@ -9098,11 +8865,12 @@ msgid "Password Change Failed"
 msgstr "Hasło wymagane"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Zmień hasło"
 
@@ -9126,54 +8894,48 @@ msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
 #: gajim/gtk/ssl_error_dialog.py:54
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "There was an error while attempting to verify the SSL certificate of your "
 "XMPP server (%s)."
 msgstr ""
-"Wystąpił błąd podczas weryfikowania certyfikatu SSL twojego serwera: "
-"%(error)s\n"
-"Czy ciagle chcesz się połączyć z serwerem?"
+"Wystąpił błąd podczas weryfikowania certyfikatu SSL twojego serwera XMPP "
+"(%s)."
 
 #: gajim/gtk/ssl_error_dialog.py:57
-#, fuzzy, python-format
+#, python-format
 msgid "Unknown SSL error '%s'"
-msgstr "Nieznany błąd SSL: %d"
+msgstr "Nieznany błąd SSL '%s'"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Rozpocznij nową konwersację"
+msgid "Start / Join Chat"
+msgstr "Rozpocznij rozmowę"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Dodaj kontakt..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "Nie znaleziono %s"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Ta usługa nie odesłała jeszcze szczegółowych informacji"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9182,33 +8944,33 @@ msgstr ""
 "Ta usługa nie była w stanie odesłać szczegółowych informacji.\n"
 "Prawdopodobnie została zamknięta lub jest zepsuta"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Inni"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Pokój"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9216,150 +8978,149 @@ msgstr ""
 "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
 "adres i spróbuj ponownie."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Tego typu usługa nie zawiera elementów, które można przeglądać."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Niepoprawna nazwa serwera"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Przeglądanie %(address)s przy użyciu konta %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "Prze_glądaj"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Usługa nie zawiera elementów, które można przeglądać."
 
-#: gajim/gtk/discovery.py:1254
-#, fuzzy
+#: gajim/gtk/discovery.py:1255
 msgid "_Command"
-msgstr "Polecenia: %s"
+msgstr "_Polecenie"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Szukaj"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanowanie %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Zasubskrybowano"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Węzeł"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nowy wpis"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Wyślij pojedynczą wiadomość"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "temat"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
-#: gajim/gtk/single_message.py:207
-#, fuzzy, python-format
+#: gajim/gtk/single_message.py:205
+#, python-format
 msgid "Characters typed: %s"
-msgstr "Niedozwolony znak"
+msgstr "Użyte znaki: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Niemożna wysłać wiadomości do %s, JID jest nieprawidłowy."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
 #: gajim/gtk/pep_config.py:47
-#, fuzzy, python-format
+#, python-format
 msgid "PEP Service Configuration (%s)"
-msgstr "Konfiguracja usługi PEP"
+msgstr "Konfiguracja usługi PEP (%s)"
 
 #: gajim/gtk/pep_config.py:76
 #, fuzzy
@@ -9380,9 +9141,9 @@ msgstr ""
 "%(message)s"
 
 #: gajim/gtk/pep_config.py:145
-#, fuzzy, python-format
+#, python-format
 msgid "Configure %s"
-msgstr "Konfiguruj"
+msgstr "Skonfiguruj %s"
 
 #: gajim/gtk/service_registration.py:143 gajim/gtk/service_registration.py:157
 #: gajim/gtk/service_registration.py:164
@@ -9399,30 +9160,12 @@ msgstr "Rejestracja zakończyła się sukcesem"
 msgid "Registration failed"
 msgstr "Rejestracja nie powiodła się"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Brak słownika dla tego języka (%s)"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
-"inny język przez ustawienie opcji speller_langugage.\n"
-"\n"
-"Bez tego podświetlanie błędnie napisanych słów nie będzie działać."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
@@ -9431,64 +9174,64 @@ msgstr ""
 "Certyfikat dla konta\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Numer GG:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "przedawnione"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Zaproszenie na czat"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "<b>%(contact)s</b> zaprasza cię do pokoju <b>%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
@@ -9503,15 +9246,20 @@ msgstr "Numer GG:"
 msgid "ICQ Number"
 msgstr "Numer ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Dodaj kontakt..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
 msgstr "%s MiB"
 
 #: gajim/gtk/add_contact.py:261
-#, fuzzy, python-format
+#, python-format
 msgid "You must supply the %s of the new contact."
-msgstr "Musisz wpisać hasło dla nowego konta."
+msgstr "Musisz podać %s dla nowego kontaktu."
 
 #: gajim/gtk/add_contact.py:288 gajim/gtk/add_contact.py:294
 #: gajim/gtk/add_contact.py:299
@@ -9551,14 +9299,13 @@ msgid "User ID:"
 msgstr "ID uzytkownika:"
 
 #: gajim/gtk/add_contact.py:485
-#, fuzzy
 msgid "Error while adding transport contact"
-msgstr "Błąd przy dodawaniu usługi %s"
+msgstr "Błąd podczas dodawania kontaktu transportowego"
 
 #: gajim/gtk/add_contact.py:486
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9721,43 +9468,64 @@ msgstr "Kontakt rozłączył się"
 msgid "Contact Connected Background "
 msgstr "Kontakt połączył się"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Opis statusu"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Opis statusu"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Opis statusu"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Opis statusu"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Niepoprawny pseudonim"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Niedozwolony znak"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Czy na pewno chcesz usunąć wybraną wiadomość?"
 
-#: gajim/gtk/themes.py:336
-#, fuzzy
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
-msgstr "Status o tej nazwie jest w użyciu. Czy chcesz go zmienić?"
+msgstr ""
+"To jest motyw, z którego aktualnie korzystasz.\n"
+"Czy chcesz usunąć ten motyw?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktywny"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Wtyczki"
@@ -9781,10 +9549,9 @@ msgid "Error: %s"
 msgstr "Błąd: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Błąd"
 
@@ -9798,56 +9565,55 @@ msgstr "Obecny status: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Sprzątam"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Zarządzaj Profilami Proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Serwer Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Dostosuj do statusu"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "Połączony"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Rozłączony"
 
 #: gajim/gtk/remove_account.py:50
-#, fuzzy
 msgid "Removing Account..."
-msgstr "Usuwanie konta %s"
+msgstr "Usuwanie konta..."
 
 #: gajim/gtk/remove_account.py:51
 msgid "Trying to remove account..."
@@ -9860,7 +9626,7 @@ msgstr "Konto"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Twoje konto zostało założone"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9869,9 +9635,8 @@ msgid "Account Removal Failed"
 msgstr "Żadne konto nie jest dostępne"
 
 #: gajim/gtk/remove_account.py:171 gajim/gtk/remove_account.py:173
-#, fuzzy
 msgid "Remove Account"
-msgstr "Usuwanie konta %s"
+msgstr "Usuń konto"
 
 #: gajim/gtk/remove_account.py:180
 #, fuzzy
@@ -9888,63 +9653,67 @@ msgid "_Unregister account from service"
 msgstr ""
 
 #: gajim/gtk/remove_account.py:217
-#, fuzzy
 msgid "Account has to be connected"
-msgstr "Konto \"%s\" jest połączone z serwerem."
+msgstr "Konto musi być połączone z serwerem"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Synchronizuj"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Co chcesz zrobić?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "Miesiąc"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "Kwartał"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Rok"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "Wszystko"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: gajim/gtk/history_sync.py:242
-#, fuzzy, python-format
+#: gajim/gtk/history_sync.py:251
+#, python-format
 msgid "%(received)s of %(max)s"
-msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
+msgstr "%(received)s z %(max)s"
 
-#: gajim/gtk/history_sync.py:246
-#, fuzzy, python-format
+#: gajim/gtk/history_sync.py:255
+#, python-format
 msgid "Downloaded %s messages"
-msgstr "Prześlij dalej nieprzeczytane wiadomości"
+msgstr "Pobrano %s wiadomości"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Klient Jabbera w GTK+"
@@ -9992,143 +9761,141 @@ msgid "we would like to thank all the package maintainers."
 msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów."
 
 #: gajim/gtk/about.py:67
-#, fuzzy
 msgid "Thanks"
-msgstr "Wdzięczny"
+msgstr "Podziękowania dla"
 
 #: gajim/gtk/about.py:69
 msgid "translator-credits"
 msgstr ""
-"Tłumaczenie na język polski: \n"
 "Witold Kieraś\n"
-"Maciej Chojnacki <maciej@chojnacki.name>\n"
-"Sławomir Domagała <godlark@gmail.com>\n"
-"Dominik Kozaczko <dominik@kozaczko.info>\n"
-"Jacek Sowiński <mruwek@mruwek.pl>\n"
-"kompowiec2 <diasp@o2.pl>\n"
-"Marek Dziarski"
+"Marek Dziarski\n"
+"Maciej Chojnacki (maciej@chojnacki.name)\n"
+"Sławomir Domagała (godlark@gmail.com)\n"
+"Dominik Kozaczko (dominik@kozaczko.info)\n"
+"Jacek Sowiński (mruwek@mruwek.pl)\n"
+"kompowiec2 (diasp@o2.pl)\n"
+"Damian Duży (damianduzy@protonmail.com)"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Wybierz plik do wysłania..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Wybierz archiwum"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Wszystkie pliki"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Wszystkie pliki"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Wyślij _plik"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Obrazki"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Wybierz archiwum"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Archiwa Zip"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Zapisz obraz jako..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tego pokoju"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Połączony"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Rozłączony"
 
-#: gajim/gtk/tooltips.py:561
-#, fuzzy
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
-msgstr "Nazwa pliku: %s"
+msgstr "Nazwa pliku: "
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Pobieranie"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Prześlij"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?status transferu:wstrzymany"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?status transferu:wstrzymany"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Opis: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?status transferu:wstrzymany"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?status transferu:wstrzymany"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?status transferu:wstrzymany"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?status transferu:wstrzymany"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?status transferu:wstrzymany"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?status transferu:wstrzymany"
@@ -10137,7 +9904,7 @@ msgstr "?status transferu:wstrzymany"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Niepoprawny plik"
@@ -10193,26 +9960,26 @@ msgstr "Podświetlenie wiadomości z czatu"
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "wymagane"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Żaden"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Anuluj"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10231,11 +9998,6 @@ msgstr "używając konta %s"
 msgid "Hide _Contact List"
 msgstr "Zaproś kontakty"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Pokaż kontakty _połączone"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
@@ -10257,9 +10019,10 @@ msgid "Information received"
 msgstr "Informacja została odebrana"
 
 #: gajim/gtk/profile.py:307
-#, fuzzy
 msgid "Without a connection, you can not publish your contact information."
-msgstr "Nie możesz wysłać informacji o sobie jeśli nie jesteś połączony."
+msgstr ""
+"Bez połączenia internetowego publikowanie informacji kontaktowych nie jest "
+"możliwe."
 
 #: gajim/gtk/profile.py:320
 msgid "Sending profile…"
@@ -10281,35 +10044,30 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Zachowanie Ustawień dla %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Ustawienia"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "Twoje preferencje archiwizacji zostały zapisane!"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Nie jesteś połączony z serwerem"
+msgid "Archiving Preferences Error"
+msgstr "_Ustawienia"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "Odebrany błąd: {}"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Ustawienia"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktywny"
@@ -10358,48 +10116,49 @@ msgstr "?Poproś (o autoryzację): Brak"
 msgid "?password:Hidden"
 msgstr "Hasło:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
-#, fuzzy
+#: gajim/gtk/server_info.py:340
 msgid ""
 "\n"
 "Disabled in preferences"
-msgstr "_Ustawienia"
+msgstr ""
+"\n"
+"Wyłączone w ustawieniach"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Audio / Video"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Można rozpocząć rozmowę głosową i wideo."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 #, fuzzy
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
@@ -10408,13 +10167,13 @@ msgstr ""
 "wymaga gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and "
 "gstreamer1.0-plugins-ugly."
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Funkcjonalność niedostępna dla systemu Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10422,21 +10181,21 @@ msgid ""
 msgstr ""
 "Umożliwia mierzenie czasu bezczynności i odpowiednie ustawienie statusu."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Wymaga biblioteki libxss."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10445,101 +10204,101 @@ msgstr ""
 "Rozmowy w sieci lokalnej, bez pośrednictwa serwera i z automatycznym "
 "wykrywaniem klientów."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Wymaga python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Wymaga GPG oraz python-gnupg (%(url)s)."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Połączenie"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Wymaga libgtkspell"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Funkcjonalność niedostępna dla systemu Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Powiadomienia"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Można rozpocząć rozmowę głosową i wideo."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Wymaga python-dbus"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Zapisz hasło"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Bezpieczne przechowywanie haseł."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Wymaga gnome-keyring oraz python-gnome2-desktop albo kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Słownik"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Wymaga libgtkspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Wymaga python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Ustawienia"
@@ -10586,7 +10345,7 @@ msgstr "Niepoprawna nazwa listy"
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Zaproś kontakty"
@@ -10610,11 +10369,10 @@ msgid "Finish"
 msgstr "_Zakończ"
 
 #: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
-#, fuzzy
 msgid "Commands"
-msgstr "Polecenia: %s"
+msgstr "Polecenia"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10644,9 +10402,8 @@ msgid "Executing…"
 msgstr "_Wykonaj komendę"
 
 #: gajim/gtk/adhoc.py:267
-#, fuzzy
 msgid "Command List"
-msgstr "Polecenia: %s"
+msgstr "Lista poleceń"
 
 #: gajim/gtk/adhoc.py:385
 #, fuzzy
@@ -10687,120 +10444,130 @@ msgstr "Prośba o autoryzację od %s"
 msgid "Loading"
 msgstr "Programuję"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Połączony"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Połącz"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: gajim/gtk/account_wizard.py:151
-#, fuzzy
+#: gajim/gtk/account_wizard.py:164
 msgid "Creating Account..."
-msgstr "Usuwanie konta %s"
+msgstr "Tworzenie konta..."
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Kliknij, aby zmienić hasło dla konta"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Łączenie..."
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Twój serwer nie akceptuje Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Niedozwolony znak"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Połączenie nie powiodło się"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
-#, fuzzy
+#: gajim/gtk/account_wizard.py:454
 msgid "Account is being created"
-msgstr "Konto \"%s\" jest połączone z serwerem."
+msgstr "Konto jest tworzone"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Utwórz nowy wpis"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Wybrany port musi być numerem portu."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "Zasób winien mieć od 1 do 1023 znaków"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Opcje zaawansowane"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Ostrzeżenie"
 
-#: gajim/gtk/account_wizard.py:727
-#, fuzzy, python-format
+#: gajim/gtk/account_wizard.py:796
+#, python-format
 msgid "Unknown TLS error '%s'"
-msgstr "Nieznany błąd SSL: %d"
+msgstr "Nieznany błąd TLS '%s'"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
-#, fuzzy
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 msgid "Create Account"
-msgstr "Usuwanie konta %s"
+msgstr "Utwórz konto"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
-#, fuzzy
+#: gajim/gtk/account_wizard.py:895
 msgid "Register on the Website"
-msgstr "Zarejestruj na %s"
+msgstr "Zarejestruj się na stronie internetowej"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Konto"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Konta"
@@ -10843,253 +10610,253 @@ msgstr "Szukaj"
 msgid "No results found"
 msgstr "Brak wyników"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Domyślny"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Czy zalogować się ponownie?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
 "zalogować się ponownie."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Niepoprawne konto"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: gajim/gtk/accounts.py:522
-#, fuzzy
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
-msgstr ""
-"Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. \n"
-"Kontynuować?"
+msgstr "Wszystkie okna czatów i czatów grupowych zostaną zamknięte."
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Niepoprawne konto"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Zaproś kontakty"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Certyfikat klienta"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Dowolny status"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Zmienia status kont lub kont"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Używaj serwerów proxy do przesyłania plików"
 
-#: gajim/gtk/accounts.py:635
-#, fuzzy
+#: gajim/gtk/accounts.py:654
 msgid "Idle Time"
-msgstr "Bezczynny od %s"
+msgstr "Czas bezczynności"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Zaproś kontakty"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priory_tet:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_używaj zmiennej środowiskowej HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Zmienia status kont lub kont"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Imię:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Nazwisko:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Nowy adres e-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Dostosuj do statusu"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Włącz"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Połączenie"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Certyfikat klienta"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "Pliki PKCS12"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Zapisz hasło"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Wtyczki"
@@ -11130,31 +10897,31 @@ msgstr "%s zasugerował(a), żebym dodał Cię do rostera."
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
-msgstr[0] "Dodano %s do kontaktów"
-msgstr[1] "Dodano %s do kontaktów"
-msgstr[2] "Dodano %s do kontaktów"
+msgstr[0] "Dodano %d kontakt"
+msgstr[1] "Dodano %d kontakty"
+msgstr[2] "Dodano %d kontaktów"
 
 #: gajim/gtk/roster_item_exchange.py:253
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
-msgstr[0] "Usunięto %s z kontaktów"
-msgstr[1] "Usunięto %s z kontaktów"
-msgstr[2] "Usunięto %s z kontaktów"
+msgstr[0] "Usunięto %d kontakt"
+msgstr[1] "Usunięto %d kontakty"
+msgstr[2] "Usunięto %d kontaktów"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Nieznany wykonawca"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Nieznany tytuł"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Nieznany album"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11164,26 +10931,26 @@ msgstr ""
 "z <i>%(source)s</i>"
 
 #: gajim/gtk/bookmarks.py:48
-#, fuzzy, python-format
+#, python-format
 msgid "Bookmarks for %s"
-msgstr "Zakładki"
+msgstr "Zakładki dla %s"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Plik jest pusty"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Usługa wysłała niepoprawne dane"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11241,127 +11008,265 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Możliwości programu"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Zwraca uwagę na błędy w wysyłanych wiadomościach."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
-#, fuzzy
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
-msgstr "Przeglądanie usług przy użyciu konta %s"
+msgstr ""
+"Wsparcie dla wyszukiwania usług, w tym węzłów oraz dla wyszukiwania "
+"użytkowników"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontakty"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Pokoje"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Ostatnio:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Rejestracja nie powiodła się"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Rozpocznij nową konwersację"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "Zasymuluj utratę połączenia"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "Zasymuluj odzyskanie połączenia"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Nieznany błąd SSL: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Brak słownika dla tego języka (%s)"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub "
+#~ "wybrać inny język przez ustawienie opcji speller_langugage.\n"
+#~ "\n"
+#~ "Bez tego podświetlanie błędnie napisanych słów nie będzie działać."
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Połącz ponownie"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Zakończ"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Pokaż kontakty _połączone"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Dodaj kontakt..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Zaproś kontakty"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Opuść pokoje"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Nowa rozmowa grupowa"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Jeśli ma wartość True, Gajim wyświetli ikonę na każdej karcie "
+#~ "zawierającej nieprzeczytaną wiadomość. Ikona ta może być animowana, w "
+#~ "zależności od motywu."
+
+#, fuzzy
+#~ msgid "Show a mini avatar in chat window tabs and as the window's icon."
+#~ msgstr "Pokaż mini awatar w zakładce okna czatu i ikonie okna."
+
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "Pokaż _awatar w zakładce czatu"
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Serwer winien mieć od 1 do 1023 znaków"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Niepoprawna litera w nazwie hosta."
+
+#~ msgid "Server address required."
+#~ msgstr "Wymagany adres serwera."
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Nazwa użytkownika winna mieć od 1 do 1023 znaków"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Niepoprawna litera w nazwie użytkownika."
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "Zasób winien mieć od 1 do 1023 znaków"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Niepoprawna litera w zasobach."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Powiadom mnie o kontaktach, które się _logują"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Kolor tła dla logujących się kontaktów."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Typ zdarzenia"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Opis zdarzenia"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Nie jesteś połączony z serwerem"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Konflikt zasobów"
 
@@ -12040,9 +11945,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Wyślij prywatną wiadomość"
 
-#~ msgid "Send _File"
-#~ msgstr "Wyślij _plik"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Uczestnicy"
@@ -14859,9 +14761,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ "odpowiada ci, możesz wskazać numer portu, jakiego chcesz używać.\n"
 #~ "Konieczna stać się może ponowna konfiguracja firewalla."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Połącz konta"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "Nie można używać OpenPGP na tym komputerze"
 
@@ -15394,9 +15293,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Wymaga python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Wymaga gnome-keyring oraz python-gnome2-desktop albo kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/pt.po b/po/pt.po
index e2b797042..479e774a6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -16,77 +16,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Contas"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Escolha chave"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Não está ligado ao servidor"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Iniciar Conversa"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Banindo %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -156,503 +162,497 @@ msgstr ""
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Mostrar Contactos _Offline"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Enviar _Mensagem Simples"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "comando"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transportes"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Renomear"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Remover"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Informações do Contacto"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Enviar _Ficheiro"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Iconset de _estados padrão:"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Contacto:"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Adicionar Contacto"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Iniciar Conversa"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Informações do Contacto"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Histórico"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+msgid "Composing Only"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Estado: "
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Contacto:"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Chat"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Chat"
+msgid "Rename…"
+msgstr "_Renomear"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Muda A_ssunto"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Chat"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Escolha chave"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Chat"
+msgid "Configure…"
+msgstr "_Continuar"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Descrição: %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Publicação vCard falhou"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "mensagem de estado:"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+msgid "Minimize on Close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+msgid "Minimize When Joining Automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Muda Alcu_nha"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "comando"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "Há %i dias atrás"
 msgstr[1] "Há %i dias atrás"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr ""
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Estado: "
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Adicionar Contacto"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "Ficheiro"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Enviar _Mensagem Simples"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Descobrir Recursos"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avançado"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferências"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Expulsando %s"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Configuração da Sala"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Mostrar Contactos _Offline"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "E_nviar Mensagem de Servidor"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Definir MOTD"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Actualizar MOTD"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Apagar MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Adicionar Contacto"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Modificar Conta..."
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Modificar Conta..."
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Contas"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Copiar JID/Endereço de Email"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Entrar num Chat"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Adicionar Contacto"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copiar Localização do Link"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Abrir Link no Navegador"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copiar JID/Endereço de Email"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Abrir Compositor de Email"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copiar Localização do Link"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Modificação da Conta"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Copiar JID/Endereço de Email"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Invisível"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Expulsar"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Banir"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "_Dono"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "_Membro"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "_Membro"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Sala:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "mensagem"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Gerir Emoticons"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Tal sala não existe."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "_Endereço:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data:"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -661,315 +661,320 @@ msgstr "Data:"
 msgid "Nickname"
 msgstr "Alcunha:"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensagem"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "a criar base de dados dos logs"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
 "reusable. This operation may take a while."
 msgstr ""
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Limpar"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Você"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Informações do Contacto"
 msgstr[1] "Informações do Contacto"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "%s quer enviar-lhe um ficheiro:"
 msgstr[1] "%s quer enviar-lhe um ficheiro:"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Mensagem de Estado"
 msgstr[1] "Mensagem de Estado"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "%s quer enviar-lhe um ficheiro:"
 msgstr[1] "%s quer enviar-lhe um ficheiro:"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Geral"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir MOTD"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Nenhum"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensagem de Estado"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Mensagem de Estado"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Guardado em: %s"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Estado"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Enviar _Ficheiro"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Ficheiro Inválido"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr ""
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Expulsando %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Tal sala não existe."
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Não está ligado ao servidor"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informações sobre si, tal como estão gravadas no servidor"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Chat"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Chat"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Chat"
@@ -984,7 +989,7 @@ msgstr ""
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Erro:"
@@ -1013,22 +1018,22 @@ msgstr "A sua nova conta foi criada com sucesso"
 msgid "Failed to Configure Group Chat"
 msgstr "Chat"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s agora é conhecido como %s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "É agora conhecido como %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s está agora %(status)s"
@@ -1153,81 +1158,81 @@ msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Se fechar esta janela, perder-se-á a ligação a estas salas."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr ""
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "E_nviar & Fechar"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nova Mensagem"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "E_nviar & Fechar"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1236,191 +1241,182 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Tamanho: "
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceitar"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Offline"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Abrir Pasta"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Remove o contacto da lista"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro na leitura do ficheiro:"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Transferência de ficheiro cancelada"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Ligação ao peer não pode ser estabelecida."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Mostrar apenas na _lista"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor de Configuração Avançada"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuração da Sala"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Iniciar Conversa"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Chat"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorização foi enviada"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Se \"%s\" aceitar este pedido, você passará a saber o seu estado."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorização foi removida"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
@@ -1430,7 +1426,7 @@ msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 msgid "desynced"
 msgstr "Avançado"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1450,7 +1446,8 @@ msgid "_Always quit when closing Gajim"
 msgstr ""
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Sair"
@@ -1603,8 +1600,8 @@ msgstr "_Renomear"
 msgid "Please enter a new name"
 msgstr "Depois da alcunha:"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Re_nomear"
@@ -1624,27 +1621,32 @@ msgstr "Quero _registar uma nova conta"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Remove o contacto da lista"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Chat"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Remove o contacto da lista"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Quero _registar uma nova conta"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1653,22 +1655,22 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Quero que este contacto saiba o meu estado depois da remoção"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Remove o contacto da lista"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1679,165 +1681,165 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Activo"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "%s quer enviar-lhe um ficheiro:"
 msgstr[1] "%s quer enviar-lhe um ficheiro:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "E_nviar"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr ""
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar _Grupos"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Remover"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "Contacto Entrou"
+msgid "Execute command"
+msgstr "comando"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1969,222 +1971,222 @@ msgstr "Iniciar Conversa"
 msgid "Messages"
 msgstr "Mensagem"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Aceita este pedido?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Autorização foi enviada"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Autorização foi enviada"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Nenhum"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 #, fuzzy
 msgid "Subscription request"
 msgstr "Pedido de Subscrição"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Pedido de Subscrição"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Subscrever"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Está banido/a desta sala."
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Remove o contacto da lista"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Erro na leitura do ficheiro:"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Ligação"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2192,21 +2194,21 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 #, fuzzy
 msgid "_Abort"
 msgstr "_Sobre"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Ligando"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2396,11 +2398,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Publicação vCard falhou"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
@@ -2741,79 +2743,74 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um directório, mas deveria ser um ficheiro"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Descrição: %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Versão D-Bus desconhecida: %s"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Nova Mensagem como %s"
 msgstr[1] "Nova Mensagem como %s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Chat"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Mudou de Estado"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Iniciou Sessão"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Terminou Sessão"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Falha na autenticação com \"%s\""
@@ -2878,77 +2875,36 @@ msgid ""
 msgstr ""
 
 #: gajim/common/config.py:93
-#, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Notificar-me sobre contactos que acabem de se: "
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Notificar-me sobre contactos que acabem de se: "
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Noti_ficação do estado da conversa:"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr ""
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr ""
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2957,29 +2913,29 @@ msgstr ""
 "Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
 "(bold) mas * * não seja removido."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr ""
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr ""
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -2987,22 +2943,22 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3011,30 +2967,30 @@ msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Enviar mensagem ao premir Ctrl+Enter e fazer nova linha com Enter "
 "(Comportamento por defeito do cliente ICQ Mirabilis)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3043,31 +2999,31 @@ msgstr ""
 "Ou um endereço URL personalizado contendo %s, onde %s é a palavra ou frase, "
 "ou 'WIKTIONARY', que significa que será usado o Wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se marcado, Gajim pode ser controlado à distância usando gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3076,33 +3032,33 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "O standart IEC diz: KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3111,7 +3067,7 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3121,22 +3077,13 @@ msgstr ""
 "Se Verdadeiro (True), sai do Gajim quando o botão X do Window Manager for "
 "clicado. Esta definição só será aplicada se o trayicon estiver a ser usado."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
-"não lidas. Dependendo do tema, este ícone poderá ser animado."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3145,12 +3092,12 @@ msgstr ""
 "Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
 "cada contacto debaixo do nome de cada um deles na lista"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3159,31 +3106,31 @@ msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
 "Window Managers) when holding pending events."
 msgstr ""
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3195,7 +3142,7 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3203,499 +3150,491 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking as in the previous message."
 msgstr ""
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr ""
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr ""
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr ""
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Não está ligado ao servidor"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr ""
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
 "'file_transfer_proxies' option for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Permitir que o Gajim envie a sua hora local."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
 "your machine for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "A comer"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Estou a trabalhar"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "A trabalhar"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefone"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Estou fora"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr ""
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3704,1128 +3643,1128 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat conter uma das palavras da lista "
 "muc_highlight_words, or quando uma mensagem conter a sua alcunha."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Para"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Chat"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Chat"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Chat"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Chat"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Criação de salas encontra-se restrita."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Chat"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Nome de conta em uso"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Tal sala não existe."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Chat"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Frase de acesso"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Cleaning"
 msgstr "Evento"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "Cooking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Gardening"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Neste grupo"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "Drinking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 #, fuzzy
 msgid "Dancing"
 msgstr "Evento"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "Expulsando %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entrar"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 #, fuzzy
 msgid "Skiing"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Shaving"
 msgstr "A comer"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "Mudar Assunto"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Hiding"
 msgstr "Expulsando %s"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Praying"
 msgstr "A comer"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Thinking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 #, fuzzy
 msgid "Relaxing"
 msgstr "simples"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Fishing"
 msgstr "Expulsando %s"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 #, fuzzy
 msgid "Gaming"
 msgstr "A comer"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "_Desligar"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 #, fuzzy
 msgid "Partying"
 msgstr "A comer"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "A comer"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 #, fuzzy
 msgid "Shopping"
 msgstr "A dormir"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 #, fuzzy
 msgid "Smoking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Sunbathing"
 msgstr "A comer"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Estou a ver um filme."
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "A comer"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 #, fuzzy
 msgid "On the Phone"
 msgstr "Estou ao telefone."
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 #, fuzzy
 msgid "Traveling"
 msgstr "A transferir"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Commuting"
 msgstr "Ligando"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr ""
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Walking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 #, fuzzy
 msgid "Coding"
 msgstr "Ligação"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausada"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Bored"
 msgstr "Negrito"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr ""
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 #, fuzzy
 msgid "Cautious"
 msgstr "Conversa"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Cold"
 msgstr "Negrito"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 #, fuzzy
 msgid "Confident"
 msgstr "_Conteúdo"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completa"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Contented"
 msgstr "_Conteúdo"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 #, fuzzy
 msgid "Creative"
 msgstr "Activo"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 #, fuzzy
 msgid "Curious"
 msgstr "_Anterior"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 #, fuzzy
 msgid "Dejected"
 msgstr "Apagar MOTD"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr ""
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr ""
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "Envious"
 msgstr "_Anterior"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 #, fuzzy
 msgid "Impressed"
 msgstr "mensagem"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisível"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Lonely"
 msgstr "Nenhum"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "Mean"
 msgstr "Geral"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 #, fuzzy
 msgid "Nervous"
 msgstr "_Anterior"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "Offended"
 msgstr "Offline"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Relieved"
 msgstr "Apagar MOTD"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 #, fuzzy
 msgid "Sad"
 msgstr "Interrompida"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 #, fuzzy
 msgid "Satisfied"
 msgstr "Nome:"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 #, fuzzy
 msgid "Serious"
 msgstr "_Anterior"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Sick"
 msgstr "_Expulsar"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Sleepy"
 msgstr "A dormir"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Stressed"
 msgstr "Rua:"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Surprised"
 msgstr "Subscrição"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 #, fuzzy
 msgid "Undefined"
 msgstr "Sublinhar"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "Apagar MOTD"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Expulsando %s"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "País:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Conta"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Descrição"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Erro:"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "Nenhum"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "[Esta mensagem é encriptada]"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Frase de acesso Necessária"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorização aceite"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Encriptação desactivada"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Frase de acesso Necessária"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Encriptação activada"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Falha na autenticação com \"%s\""
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Falha na autenticação com \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4887,12 +4826,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s erro de configuração"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4904,297 +4843,256 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Caractere inválido no hostname."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Endereço de servidor necessário."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Caractere inválido no nome de utilizador"
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Caractere inválido no recurso."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Indisponível"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Disponível"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Mostrar hora:"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Ligando"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Offline"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Para"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?SO:Desconhecido"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "_Dono"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "_Administrador"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "_Membro"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está a escrever uma mensagem..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensagem pendente"
 msgstr[1] "%d mensagens pendentes"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "_Entrar num Chat"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Erro na leitura do ficheiro:"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um ficheiro, mas deveria ser um directório"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
@@ -5290,90 +5188,90 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 #, fuzzy
 msgid "File is empty"
 msgstr "Localização do ficheiro"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tal sala não existe."
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Encriptação desactivada"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 #, fuzzy
 msgid "Change status information"
 msgstr "Informações do Contacto"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 #, fuzzy
 msgid "Change status"
 msgstr "Contacto Saiu"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 #, fuzzy
 msgid "Free for chat"
 msgstr "Livre para conversar"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 #, fuzzy
 msgid "Online"
 msgstr "_Continuar"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrição"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contacto:"
@@ -5398,7 +5296,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Conta"
 
@@ -5409,7 +5307,7 @@ msgstr "Chat"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
@@ -5433,7 +5331,7 @@ msgstr "_Entrar num Chat"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Entrar"
@@ -5451,17 +5349,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -5613,7 +5511,7 @@ msgstr "Informações do Contacto"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Descrição"
 
@@ -5821,39 +5719,44 @@ msgstr "Trabalho"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Sobre"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Entrar num Chat"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Volto logo"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Entrar"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Removendo %s conta"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5928,6 +5831,7 @@ msgid "Strike"
 msgstr "Serviço"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr ""
 
@@ -5941,135 +5845,130 @@ msgstr "Letra:"
 msgid "Clear formatting"
 msgstr "Informações do Contacto"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Escolher Ficheiro para Enviar"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Banindo..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Depois da alcunha:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Muda Alcu_nha"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Muda A_ssunto"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Introduza a nova senha:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Chat"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Ocorreu um erro:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 msgid "_Try again"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Participante"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 #, fuzzy
 msgid "Insert Emoji"
 msgstr "Gerir Emoticons"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Participante"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Banir"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Chat"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Descrição: %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 msgid "Reason (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Invisível"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Evento"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Eventos"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6168,20 +6067,20 @@ msgid "Add"
 msgstr "Endereço"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Remover"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Recurso:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Estado"
 
@@ -6191,7 +6090,7 @@ msgid "Client"
 msgstr "Cliente:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Definições Personalizadas</b>"
@@ -6332,38 +6231,39 @@ msgstr ""
 msgid "_Show contact list on startup"
 msgstr "Mostrar janela principal ao arranque"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Fundir contas"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6372,12 +6272,12 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6386,54 +6286,54 @@ msgstr ""
 "Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
 "nomes de cada um na janela principal"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Contacto:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "_Entrar num Chat"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Contacto Entrou"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 msgid "Enable spell _checking"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6441,29 +6341,29 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "conteúdo da mensagem"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6472,125 +6372,126 @@ msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Impossível entrar na sala"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Impossível entrar na sala"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Publicação vCard falhou"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Iconset de _estados padrão:"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Conversa"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Quando um novo evento é recebido"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Permitir popup/notificações quando estou _ausente/indisponível/ocupado/"
 "invisível"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Permitir popup/notificações quando estou _ausente/indisponível/ocupado/"
 "invisível"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6599,66 +6500,66 @@ msgstr ""
 "Gajim o notificará a cada nova mensagem através de um popup no canto "
 "inferior direito do ecrã"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Notificações Visuais</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gerir..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 msgid "Allow playing sounds when I'm _busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Som"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificação da Conta"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Indisponível"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6666,7 +6567,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6674,109 +6575,109 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minutos"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Pedir a mensagem de estado quando eu me: "
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensagem de Estado"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Mensagem de Estado"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Iconset de _estados padrão:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Usar iconsets de _transportes"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6786,121 +6687,131 @@ msgstr ""
 "(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
 "disponível, ausente, ocupado, etc...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 #, fuzzy
 msgid "_Convert ASCII Emojis"
 msgstr "Gerir Emoticons"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 #, fuzzy
 msgid "Style"
 msgstr "Interrompida"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Recursos dos Servidores"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Mensagem de Estado"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Iniciar Conversa"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Ligação"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Servidor:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 #, fuzzy
 msgid "_Manage..."
 msgstr "Gerir..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Diversos</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Editor de Configuração Avançada"
@@ -7085,12 +6996,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Introduza a nova senha:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Acções A_vançadas"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Usar hostname/porta personalizados"
@@ -7177,7 +7088,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Ligar"
@@ -7191,7 +7102,7 @@ msgstr "_Entrar num Chat"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7218,8 +7129,8 @@ msgstr "Voltar às Cores Padrão"
 msgid "Resets value to default"
 msgstr "Voltar às Cores Padrão"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Nome do Host:"
@@ -7263,7 +7174,7 @@ msgstr "Nome de utilizador inválido"
 msgid "Proxy Host"
 msgstr "Proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Tipo"
 
@@ -7277,8 +7188,7 @@ msgstr "Protocolo:"
 msgid "Copy info to clipboard"
 msgstr "_Copiar Localização do Link"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 #, fuzzy
 msgid "Features"
 msgstr "Recursos dos Servidores"
@@ -7459,6 +7369,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Mudar Mensagem de Estado"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -7536,8 +7451,8 @@ msgstr "Interrompida"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7737,80 +7652,106 @@ msgstr "Publicação vCard falhou"
 msgid "_Name"
 msgstr "_Nome: "
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Iniciar Conversa"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Chat"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "_Histórico"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Publicação vCard falhou"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Preferências"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Sair"
+msgid "_Accounts"
+msgstr "Contas"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Voz"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Mostrar Contactos _Offline"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Mostrar Contactos _Offline"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Transportes"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Consola XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Transferências de Ficheiros"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Ajuda"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "_Continuar"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "_Continuar"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Recursos dos Servidores"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Sobre"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7825,6 +7766,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Chat"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8101,60 +8047,68 @@ msgstr "Contacto Entrou"
 msgid "Create new group chat"
 msgstr "Chat"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Preferências"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "mensagem de estado:"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Mostrar Consola _XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Aparência"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Mostrar Contactos _Offline"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 #, fuzzy
 msgid "Contacts"
 msgstr "Contacto:"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Informações do Contacto"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Contacto:"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Contacto:"
@@ -8231,12 +8185,16 @@ msgstr "Neste grupo"
 msgid "Group Chat Configuration"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Consola XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Iniciar Conversa"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filtro:"
@@ -8284,11 +8242,6 @@ msgstr "Mostrar Todos os _Eventos Pedentes"
 msgid "Mute Sounds"
 msgstr "Sons Wav"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Preferências"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8606,124 +8559,124 @@ msgstr "Transferência de %(filename)s de %(name)s interrompida."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "Neste grupo"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Chat"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Chat"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Chat"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Chat"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Chat"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "O serviço não pôde ser encontrado"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Chat"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Chat"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Chat"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Não está ligado ao servidor"
@@ -8752,7 +8705,7 @@ msgid "Sender: %s"
 msgstr "Remetente: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -8903,7 +8856,7 @@ msgstr "Ficheiro: "
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Remetente: "
 
@@ -8918,7 +8871,7 @@ msgid "Change"
 msgstr "Muda Alcu_nha"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Volto logo"
@@ -8949,11 +8902,12 @@ msgid "Password Change Failed"
 msgstr "Senha Necessária"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Ocorreu um erro ao criar a conta"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Mudar Senha"
 
@@ -8988,40 +8942,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Ligação"
+msgid "Start / Join Chat"
+msgstr "Iniciar Conversa"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Adicionar Contacto"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s não encontrado"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço/recurso ainda não respondeu com informações detalhadas"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9030,33 +8979,33 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Outros"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "C_hat"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9064,146 +9013,146 @@ msgstr ""
 "Não há serviço/recurso no endereço que introduziu, ou pelo menos não "
 "responde. Verifique o endereço e tente novamente."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço/recurso não contém itens para explorar."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "usando a conta %s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Explorar"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Buscando %d / %d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Utilizadores"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrição"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Nó"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nova Sala"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "Assunto:"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Carácter não permitido"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
@@ -9250,88 +9199,74 @@ msgstr "Registo da conta efectuado com sucesso"
 msgid "Registration failed"
 msgstr "Publicação vCard falhou"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Uma ligação não está disponível"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "para conta %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -9344,6 +9279,11 @@ msgstr ""
 msgid "ICQ Number"
 msgstr ""
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Adicionar Contacto"
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9401,7 +9341,7 @@ msgstr "erro ao enviar"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9559,42 +9499,62 @@ msgstr "Contacto Entrou"
 msgid "Contact Connected Background "
 msgstr "Nome do Contacto"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Mensagem de Estado"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Mensagem de Estado"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Mensagem de Estado"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Mensagem de Estado"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Carácter não permitido"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr ""
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Activo"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Publicação vCard falhou"
@@ -9619,10 +9579,9 @@ msgid "Error: %s"
 msgstr "Introduza a sua mensagem :"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 #, fuzzy
 msgid "Error"
 msgstr "Erro:"
@@ -9637,49 +9596,49 @@ msgstr "O estado é agora: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Evento"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Gerir Perfis de Proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Offline"
@@ -9700,7 +9659,7 @@ msgstr "Conta"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "A sua nova conta foi criada com sucesso"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9733,60 +9692,65 @@ msgstr "_Registar nova conta"
 msgid "Account has to be connected"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Mostrar Contactos _Offline"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ligando"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Gajim - %d mensagem não lida"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Cliente Jabber GTK+"
@@ -9839,131 +9803,131 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Escolher Ficheiro para Enviar"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Escolha chave"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Todos os ficheiros"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Todos os ficheiros"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Enviar Ficheiro"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Imagens"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Escolha chave"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Todos os ficheiros"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 #, fuzzy
 msgid "Connected"
 msgstr "Ligação"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto Entrou"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Nome do ficheiro: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Download"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Upload"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Transferência de Ficheiro Parada"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Mostrar hora:"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Mostrar hora:"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 #, fuzzy
 msgid "Description: "
 msgstr "Descrição: %s"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Mostrar hora:"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Mostrar hora:"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 #, fuzzy
 msgid "?transfer status:Paused"
 msgstr "Mostrar hora:"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Mostrar hora:"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Mostrar hora:"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Mostrar hora:"
@@ -9972,7 +9936,7 @@ msgstr "Mostrar hora:"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Ficheiro Inválido"
@@ -10033,26 +9997,26 @@ msgstr ""
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Senha Necessária"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Nenhum"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancelar"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10071,11 +10035,6 @@ msgstr "usando a conta %s"
 msgid "Hide _Contact List"
 msgstr "Contacto:"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Mostrar Contactos _Offline"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Esconder este menú"
@@ -10126,35 +10085,30 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Preferências"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Preferências"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Não está ligado ao servidor"
+msgid "Archiving Preferences Error"
+msgstr "_Preferências"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Preferências"
-
 #: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
@@ -10205,172 +10159,172 @@ msgstr "Nenhum"
 msgid "?password:Hidden"
 msgstr "Senha:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Preferências"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "A mensagem de estado auto-indisponível"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 msgid "Requires: libxss"
 msgstr ""
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr ""
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr ""
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr ""
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Ligação"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "_Voz"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "A mensagem de estado auto-indisponível"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Modificação da Conta"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Senha Necessária"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Guardar senha"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "_Histórico"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr ""
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 msgid "Requires: Gspell"
 msgstr ""
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr ""
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Preferências"
@@ -10420,7 +10374,7 @@ msgstr "Nome de utilizador inválido"
 msgid "You must enter a name to create a privacy list."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Contacto:"
@@ -10448,7 +10402,7 @@ msgstr "_Terminar"
 msgid "Commands"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10521,119 +10475,133 @@ msgstr "Pedido de subscrição de %s"
 msgid "Loading"
 msgstr "Ligação"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Ligação"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Ligar"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Removendo %s conta"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Clique para mudar a senha da conta"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Ligando"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Este serviço não contém quaisquer itens para explorar"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Carácter não permitido"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 msgid "This server does not allow signup."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Ligação"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Adicionar Contacto"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Contacto:"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Acções A_vançadas"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Banindo %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Removendo %s conta"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registar para %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Conta"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Contas"
@@ -10677,244 +10645,248 @@ msgstr "_Pesquisar"
 msgid "No results found"
 msgstr "%s não encontrado"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 msgid "Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 msgid "Re-Login now?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 #, fuzzy
 msgid "_Later"
 msgstr "Ú_ltimo"
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 msgid "Please check if Bonjour is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Nome de conta inválido"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Nome de conta inválido"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Contacto:"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Nome de utilizador inválido"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Ligar ao arranque"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Guardar _históricos das conversas para todos os contactos"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Estado: "
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "lista de transferências de ficheiros"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Versão %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Contacto:"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorar eventos de contactos que não estão na lista"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "_Prioridade"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Sessão bus não está disponível"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Nome:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Nome:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "E-Mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Activar"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Porta:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Ligação"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Nome de utilizador inválido"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Guardar senha"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Publicação vCard falhou"
@@ -10967,19 +10939,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Remove o contacto da lista"
 msgstr[1] "Remove o contacto da lista"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Artista Desconhecido"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Título Desconhecido"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Fonte Desconhecida"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10991,21 +10963,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Localização do ficheiro"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11062,127 +11034,222 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Recursos dos Servidores"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Automatic spell-checking for your messages"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Buscar Serviço usando conta %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Contacto:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Chat"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Histórico dos registos"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Publicação vCard falhou"
 
 #, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Ligação"
+
+#, fuzzy
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Versão D-Bus desconhecida: %s"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Uma ligação não está disponível"
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "Contacto Entrou"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Sair"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Mostrar Contactos _Offline"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Adicionar Contacto"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Contacto:"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Chat"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Chat"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo "
+#~ "mensagens não lidas. Dependendo do tema, este ícone poderá ser animado."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Caractere inválido no hostname."
+
+#~ msgid "Server address required."
+#~ msgstr "Endereço de servidor necessário."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Caractere inválido no nome de utilizador"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Caractere inválido no recurso."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Notificar-me sobre contactos que acabem de se: "
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Notificar-me sobre contactos que acabem de se: "
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Noti_ficação do estado da conversa:"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Evento"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Eventos"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Não está ligado ao servidor"
+
+#, fuzzy
 #~ msgid "Resource Conflict"
 #~ msgstr "Recurso: "
 
@@ -11647,9 +11714,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "_Send Private Message"
 #~ msgstr "E_nviar Mensagem Privada"
 
-#~ msgid "Send _File"
-#~ msgstr "Enviar _Ficheiro"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Participantes"
@@ -13383,10 +13447,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Interrompida"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Publicação vCard falhou"
-
 #~ msgid "cyan"
 #~ msgstr "cyan"
 
@@ -13519,10 +13579,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "_Histórico"
 
 #, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "_Histórico"
-
-#, fuzzy
 #~ msgid "Hides the buttons in chat windows."
 #~ msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
@@ -13760,10 +13816,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "Usar hostname/porta personalizados"
 
 #, fuzzy
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Fundir contas"
-
-#, fuzzy
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "Não é possível usar OpenPGP neste computador"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a50e58a8b..4fa633978 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-12-31 23:22-0300\n"
 "Last-Translator: Djavan Fagundes <dnoway@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
@@ -23,72 +23,78 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Contas"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "e autenticada"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "e NÃO autenticada"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "Criptografia %(type)s está ativa %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Desfazer"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "Colar como citação"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "Colar imagem"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr "Você está tentando colar uma imagem"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 "Tem certeza de que deseja colar a imagem da sua área de transferência na "
 "janela de bate-papo?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "_Colar"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Aviso"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 "Se você enviar um arquivo para <b>%s</b>, ele(a) saberá o seu JID real."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -153,429 +159,440 @@ msgstr "Não há requisições de inscrições pendentes."
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 msgid "Not in contact list"
 msgstr "Não está na sua lista de contatos"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 msgid "I would like to add you to my contact list"
 msgstr "Eu gostaria de adicioná-lo à minha lista de contatos."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Enviar mensagem única..."
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "_Executar comando..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Gerenciar transporte"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "_Renomear…"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informações"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Enviar _arquivo..."
+#: gajim/gui_menu_builder.py:517
+#, fuzzy
+msgid "Send File"
+msgstr "Enviar _arquivo"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 msgid "Upload File…"
 msgstr "Enviar Arquivo..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr "Enviar arquivo diretamente..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 msgid "Send Chatstate"
 msgstr "Último estado"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+#, fuzzy
+msgid "Invite Contacts…"
 msgstr "Convidar _contatos"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
-msgid "Add to Contact List"
-msgstr "Adicionar à sua lista de contatos"
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
+msgid "Add to Contact List…"
+msgstr "Adicionar à sua lista de contatos..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 msgid "Voice Chat"
 msgstr "Chat por Voz"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 msgid "Video Chat"
 msgstr "Videochamada"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "Informação"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "Histórico"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Apenas escrevendo"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Todos os status"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Convidar _contatos"
+msgid "All Chat States"
+msgstr "Todos os status"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 msgid "Manage Group Chat"
 msgstr "Gerenciar grupos de bate-papo"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
-msgid "Rename Group Chat"
-msgstr "Renomear Conversa em Grupo"
+#: gajim/gui_menu_builder.py:575
+#, fuzzy
+msgid "Rename…"
+msgstr "_Renomear…"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
+#: gajim/gui_menu_builder.py:576
+#, fuzzy
+msgid "Change Subject…"
 msgstr "Alterar as_sunto"
 
-#: gajim/gui_menu_builder.py:579
-msgid "Configure Group Chat"
-msgstr "Configurar grupo de bate-papo"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "Enviar avatar..."
 
-#: gajim/gui_menu_builder.py:581
-msgid "Destroy Group Chat"
-msgstr "Destruir conferência"
+#: gajim/gui_menu_builder.py:578
+#, fuzzy
+msgid "Configure…"
+msgstr "Configurar"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Destruir"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 msgid "Chat Settings"
 msgstr "Configurações de chat"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+#, fuzzy
+msgid "Show Join/Leave"
 msgstr "Mostrar entrar/sair"
 
-#: gajim/gui_menu_builder.py:585
-msgid "Show status changes"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Show Status Changes"
 msgstr "Mostrar as alterações de status"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
+#: gajim/gui_menu_builder.py:584
+#, fuzzy
+msgid "Notify on all Messages"
 msgstr "Notificar em todas as mensagens"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Minimize on Close"
 msgstr "Minimizar ao fechar"
 
-#: gajim/gui_menu_builder.py:589
-msgid "Minimize when joining automatically"
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Minimize When Joining Automatically"
 msgstr "Minimizar ao entrar automaticamente"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "Limite de sincronização"
 
-#: gajim/gui_menu_builder.py:593
-msgid "Change Nickname"
+#: gajim/gui_menu_builder.py:591
+#, fuzzy
+msgid "Change Nickname…"
 msgstr "Alterar apelido"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "Solicitar Voz"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "Executar comando"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+#, fuzzy
+msgid "Execute Command…"
+msgstr "_Executar comando..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr "Sair"
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "Sem limite"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dia"
 msgstr[1] "%i dias"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Apenas escrevendo"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Todos os status"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
 msgstr "Adicionar contato..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Perfil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "Enviar _mensagem simples..."
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
 msgstr "_Descobrir serviços"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "Informação do Servidor"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avançado"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "_Preferências de arquivamento"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 msgid "Blocking List"
 msgstr "Lista de bloqueados"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Favoritos"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 msgid "PEP Configuration"
 msgstr "Configuração do PEP"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "Synchronise History…"
 msgstr "Sincronizar Histórico"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 msgid "Send Server Message…"
 msgstr "Enviar mensagem de servidor..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 msgid "Set MOTD…"
 msgstr "Definir MOTD..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 msgid "Update MOTD…"
 msgstr "Atualizar MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 msgid "Delete MOTD…"
 msgstr "Excluir MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 msgid "_Add Account…"
 msgstr "_Adicionar Conta..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 msgid "_Modify Accounts…"
 msgstr "_Modificar Conta..."
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 msgid "_Modify Account…"
 msgstr "_Modificar Conta..."
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Contas"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 msgid "Copy XMPP Address"
 msgstr "Copiar endereço XMPP"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
 msgstr "Entrar em um bate-papo em grupo"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-msgid "Add to Contact List…"
-msgstr "Adicionar à sua lista de contatos..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
 msgstr "Copiar a Localização do Link"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 msgid "Open Link in Browser"
 msgstr "Abrir Link no Navegador"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
 msgstr "Copiar Endereço de E-mail"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 msgid "Open Email Composer"
 msgstr "Abrir Cliente de e-mail"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 msgid "Copy Location"
 msgstr "Copiar Localização"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 msgid "Show Location"
 msgstr "Mostrar localização"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 msgid "Copy XMPP Address/Email"
 msgstr "Copiar endereço XMPP/e-mail"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 msgid "Invite"
 msgstr "Convidar"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 msgid "Block"
 msgstr "Bloco"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 msgid "Kick"
 msgstr "Expulsar"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 msgid "Ban"
 msgstr "Banir"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 msgid "Make Owner"
 msgstr "Pôr Como Titular"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 msgid "Make Admin"
 msgstr "Criar Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 msgid "Make Member"
 msgstr "Tornar Membro"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 msgid "Revoke Member"
 msgstr "Revogar Membro"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr "Permitir Voz"
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 msgid "Revoke Voice"
 msgstr "Revogar Voz"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 msgid "Copy"
 msgstr "Copiar"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Uso:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Opções:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Mostrar esta mensagem de ajuda e sair"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Escolha uma pasta para o arquivo de log"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "%s não existe."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 msgid "XMPP Address"
 msgstr "Endereço XMPP"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -583,27 +600,27 @@ msgstr "Data"
 msgid "Nickname"
 msgstr "Apelido"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensagem"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Assunto"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Limpeza do banco de dados"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 msgid "Clean up the database?"
 msgstr "Limpar o banco de dados?"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
@@ -613,178 +630,178 @@ msgstr ""
 "Normalmente, o tamanho do banco de dados alocado não será liberado, apenas "
 "se tornará reutilizável. Esta operação pode demorar um pouco."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 msgid "_Cleanup"
 msgstr "_Limpar"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Você"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s em %(time)s disse: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Deletar"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Apagar conversa"
 msgstr[1] "Cancelar confirmação"
 
 # The text it is not accepting correction
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Deseja excluir permanentemente esta conversa com <b>%s</b>?"
 msgstr[1] "Deseja excluir permanentemente essas conversas?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Apagar mensagem"
 msgstr[1] "Mensagem padrão"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Você quer excluir permanentemente esta mensagem?"
 msgstr[1] "Você quer excluir permanentemente estas mensagens?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contato: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr "Endereço XMPP: <i>%s</i>"
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Geral"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Definir humor"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Nenhum"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s mensagem de status"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Sobrescrever mensagem de status?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Este nome já está sendo usado. Você quer sobrescrever esse modelo?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr "_Sobrescrever"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 msgid "Status Preset"
 msgstr "Modelo de Mensagem de Estado"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 msgid "Save status as preset"
 msgstr "Salvar estado como modelo"
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 msgid "Please assign a name to this status message preset"
 msgstr "Por favor, escreva um nome para este modelo de mensagem de estado"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 msgid "_Save"
 msgstr "_Salvar"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 msgid "New Status"
 msgstr "Novo Estado"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sem uma conexão, você pode não sincronizar seus contatos."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Você não pode sincronizar com uma conta a menos que esteja conectado."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "um áudio e vídeo"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "um áudio"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "um video"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -793,85 +810,89 @@ msgstr ""
 "%(contact)s quer iniciar uma chamada de %(type)s com você. Quer responder a "
 "chamada?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Enviar _arquivo..."
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Enviar arquivo (máx.%s MiB)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 msgid "No File Transfer available"
 msgstr "Nenhuma transferência de arquivo disponível"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 msgid "Invalid XMPP Address"
 msgstr "Endereço XMPP inválido"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, python-format
 msgid "Kick %s"
 msgstr "Chutar %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr "Lista de banidos %s"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Inserir apelido"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 msgid "Voice Request"
 msgstr "Pedido de Voz"
 
-#: gajim/groupchat_control.py:830
-#, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+#: gajim/groupchat_control.py:831
+#, fuzzy, python-format
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr "<b>%s</b> de <b>%s</b> pede voz"
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr "_Aprovar"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s alterou o assunto para %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr "A conversa em grupo agora exibe membros indisponíveis"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 msgid "Group chat now does not show unavailable members"
 msgstr "A conversa em grupo agora não mostra membros indisponíveis"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr "Uma configuração não relacionada à privacidade foi alterada"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 msgid "Conversations are stored on the server"
 msgstr "Histórico de conversas são armazenados no servidor"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 msgid "Conversations are not stored on the server"
 msgstr "Histórico de conversas não são armazenados no servidor"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 msgid "Group chat is now non-anonymous"
 msgstr "Agora a conversa em grupo é não-anônima"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 msgid "Group chat is now semi-anonymous"
 msgstr "Agora a conversa em grupo é semi-anônima"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 msgid "Group chat is now fully anonymous"
 msgstr "Agora a conversa em grupo é totalmente anônima"
 
@@ -885,7 +906,7 @@ msgstr "Ping? (%s)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Erro."
 
@@ -912,22 +933,22 @@ msgstr "Uma nova conversa em grupo foi criada"
 msgid "Failed to Configure Group Chat"
 msgstr "Configurar grupo de bate-papo"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} agora é conhecido como {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Agora você está {show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} agora está {show}{status}"
@@ -1051,51 +1072,51 @@ msgstr "Você tem certeza que quer sair dessa conferência?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Se você fechar esta janela, você sairá de '%s'."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr "_Sair"
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s foi convidado para esta conversa em grupo"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Exibe uma lista de formatações"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Este contato não suporta HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s segundos)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s estado: %(state)s, razão: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da conferência %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Nota: O histórico de conversa está desativado para esse contato."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr "Nota: O histórico de conversa está desativado para essa conta."
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, python-format
 msgid ""
 "You just received a new message from %s.\n"
@@ -1104,26 +1125,26 @@ msgstr ""
 "Você acabou de receber uma nova mensagem de %s.\n"
 "Quer fechar essa aba?"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 msgid "Close"
 msgstr "Fechar"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nova mensagem"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 msgid "_Close"
 msgstr "Fe_char"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1132,173 +1153,164 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s está agora %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 msgid "File Transfer"
 msgstr "Transferência de Arquivos"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Tamanho"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 msgid "_Accept"
 msgstr "_Aceitar"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "_Recusar"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Transferência do arquivo completa"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 msgid "Open _Folder"
 msgstr "Abrir _Pasta"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 msgid "Group Chat Invitation"
 msgstr "Convite para Conversa em Grupo"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "O contato remoto parou a transferência"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Erro abrindo arquivo"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Transferência do arquivo parada"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivos cancelada"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Conexão com o par não pode ser estabelecida."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr "Mostra versão da aplicação"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "Mostrar somente erros críticos"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 "Separar arquivos de perfil completamente (até mesmo banco de dados de "
 "histórico e plugins)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr "Mostrar estrofes XML e outras informações de depuração"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Usar perfil definido no diretório de configuração"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Definir diretório de configuração"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Configurar sistema de registro"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "Exibir todos alarmes"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "Terminal IPython aberto"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Exibir uma janela popup com o próximo evento pendente"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Iniciar uma nova conversa"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "Simular a perda de conectividade"
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "Simular a volta de conectividade"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 msgid "Group chats"
 msgstr "Conversas em grupo"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 msgid "Authorization sent"
 msgstr "Autorização enviada"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" saberá seu estado."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o estado dele ou dela."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 msgid "Authorization removed"
 msgstr "Autorização removida"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
@@ -1307,7 +1319,7 @@ msgstr "Agora \"%s\" você sempre o verá como offline."
 msgid "desynced"
 msgstr "não sincronizado"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 msgid "Quit Gajim"
 msgstr "Sair do Gajim"
 
@@ -1324,7 +1336,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "_Sempre sair ao fechar o Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Sair"
 
@@ -1466,8 +1479,8 @@ msgstr "Renomear grupo %s?"
 msgid "Please enter a new name"
 msgstr "Por favor, entre com um novo nome"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 msgid "_Rename"
 msgstr "_Renomear"
 
@@ -1484,24 +1497,28 @@ msgstr "Você quer remover %s da lista de contatos?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "_Remover também todos os contatos deste grupo da sua lista de contatos"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+msgid "Rename Group Chat"
+msgstr "Renomear Conversa em Grupo"
+
+#: gajim/roster_window.py:3045
 msgid "Please enter a new name for this group chat"
 msgstr "Por favor digite um novo nome de usuário para essa conversa em grupo"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 msgid "Remove Contact"
 msgstr "Remover Contato"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 msgid "Remove contact from contact list"
 msgstr "Remover contato da lista"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Você vai remover %(name)s (%(jid)s) da sua lista de contatos.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
@@ -1509,19 +1526,19 @@ msgstr ""
 "Ao remover este contato, você também remove a autorização, fazendo com que "
 "ele sempre o veja como offline."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 msgid "_I want this contact to know my status after removal"
 msgstr "_Eu quero que este contato saiba meu estado após a remoção"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 msgid "Remove contacts from contact list"
 msgstr "Remover contato da lista de contatos"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1534,24 +1551,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 msgid "Remove Contacts"
 msgstr "Remover Contatos"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1560,11 +1577,11 @@ msgstr ""
 "Portanto essas informações não estarão salvas na próxima vez que você "
 "conectar."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
 msgstr "Você está prestes a criar um metacontato"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
@@ -1574,117 +1591,117 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas XMPP ou "
 "transportes."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 msgid "Create Metacontact"
 msgstr "Criar Metacontato"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr "_Criar"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Enviar este arquivo para %s:\n"
 msgstr[1] "Enviar estes arquivos para %s:\n"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Enviar"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %(from)s para %(to)s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "Tornar %s primeiro contato"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Transformar %(contact1)s e %(contact2)s em metacontatos"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Publicar Localização"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "Editar _Grupos…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Remover"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Reconectar"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "Executar comando"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 "Observadores podem ver seu estado, mas você não tem permissão para ver o "
@@ -1807,66 +1824,66 @@ msgstr "Conversas privadas"
 msgid "Messages"
 msgstr "Mensagens"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorização HTTP (%(method)s) para %(url)s (ID: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Você aceita esse pedido (conta: %s)?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 msgid "Authorization Request"
 msgstr "Pedido de Autorização"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 msgid "HTTP Authorization Request"
 msgstr "Pedido de Autorização HTTP"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 msgid "_No"
 msgstr "_Não"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Solicitação de inscrição"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "O contato \"%s\" autorizou você para ver seu estado."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 msgid "Subscription Removed"
 msgstr "Inscrição Removida"
 
-#: gajim/gui_interface.py:354
-#, python-format
-msgid "%s (%s) has removed subscription from you"
+#: gajim/gui_interface.py:328
+#, fuzzy, python-format
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "%s (%s) removeu sua inscrição"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
@@ -1874,142 +1891,142 @@ msgstr ""
 "Você sempre verá esse contato como desconectado.\n"
 "Você quer removê-lo da sua lista de contatos?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Desinscrever"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s recusou o convite: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s recusou o convite"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Você foi convidado para a conferência {room} por {user}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "Palavra Passe do Certificado Obrigatória"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Insira a senha do certificado para a conta %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Erro na transferência de arquivos"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 msgid "Remote Contact Stopped Transfer"
 msgstr "O Contato Remoto Parou a Transferência"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 msgid "Error Opening File"
 msgstr "Erro ao Abrir Arquivo"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 msgid "SSL Certificate Error"
 msgstr "Erro de Certificado SSL"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Transferência de Arquivo Falhou"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s recebido de %(name)s."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transferência do arquivo %(filename)s de %(name)s falhou."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Você enviou com sucesso o %(filename)s para %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transferência do arquivo %(filename)s para %(name)s falhou."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 msgid "Please enter a new username for your local account"
 msgstr "Por favor digite um novo nome de usuário para sua conta local"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer iniciar uma conversa com voz."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Solicitação de conversa com voz"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 msgid "Insecure Connection"
 msgstr "Conexão Insegura"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2020,19 +2037,19 @@ msgstr ""
 "método de conexão não seguro. Isso significa que as conversas não serão "
 "criptografadas. Conectar em modo PLANO é fortemente desencorajado."
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 msgid "_Connect Anyway"
 msgstr "_Conectar Mesmo Assim"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr "Gajim: Console IPython"
 
@@ -2223,11 +2240,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Upload do Avatar Falhou"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2551,77 +2568,72 @@ msgstr ""
 "Argumento \"%(arg)s\" não está especificado. \n"
 "Digite\"%(basename)s help %(command)s\" para maiores informações"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um diretório, mas deveria ser um arquivo"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, python-format
 msgid "Creating %s"
 msgstr "Criando %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Erro de SSL desconhecido: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Enviar mensagem privada"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Nova mensagem de %(nickname)s"
 msgstr[1] "%(n_msgs)i mensagens não lidas de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 msgid "New Group Chat Message"
 msgstr "Nova Mensagem de Conversa em Grupo"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s alterou seu status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s agora está %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "O contato alterou seu status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectou"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectou"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Falha na autenticação com \"%s\""
@@ -2690,59 +2702,22 @@ msgstr ""
 "notificação não seja mostrado."
 
 #: gajim/common/config.py:93
-msgid "Notification color for contacts signing in."
-msgstr "Cor da notificação para contatos conectando."
-
-#: gajim/common/config.py:94
-msgid "Notification color for contacts signing out."
-msgstr "Cor da notificação para contatos desconectando."
-
-#: gajim/common/config.py:95
-msgid "Notification color for new message notification."
-msgstr "Cor da notificação para novas mensagens."
-
-#: gajim/common/config.py:96
-msgid "Notification color for file transfer request."
-msgstr "Cor da notificação para pedido de transferência de arquivo."
-
-#: gajim/common/config.py:97
-msgid "Notification color for file transfer errors."
-msgstr "Cor da notificação de erros na transferência de arquivos."
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-"Cor de notificação para transferências de arquivos paradas ou concluídas."
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr "Cor de notificação para convites de conversa em grupo."
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr "Cor de fundo da notificação de mudança de estado."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr "Cor de notificação para outros diálogos."
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Lista (separada por espaços) de linhas (contas e grupos) que estão "
 "recolhidos."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "padrão"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 msgid "Language used for spell checking."
 msgstr "Idioma usado pelo corretor ortográfico."
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2752,15 +2727,15 @@ msgstr ""
 "'às vezes' - exibir hora a cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca exibir a hora."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr "Quando ativado, emojis ASCII serão convertidos em emojis gráficos."
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Aproveite os pare * /_ como caracteres de formatação."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
@@ -2768,7 +2743,7 @@ msgstr ""
 "Se ativado, não remove o */_. Assim *ABC* será negrito mas com * * não "
 "removido."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
@@ -2776,7 +2751,7 @@ msgstr ""
 "Caractere a adicionar após o apelido quando se estiver usando o recurso de "
 "completar apelido (tecla Tab) na conversa em grupo."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
@@ -2784,7 +2759,7 @@ msgstr ""
 "Caractere proposto para adicionar ao final do apelido desejado quando ele já "
 "estiver sendo usado na conversa em grupo."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
@@ -2793,11 +2768,11 @@ msgstr ""
 "escondê-la e restaurá-la-á ao mostrar a janela da lista de contatos "
 "novamente."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr "Coloque a lista de contatos à direita no modo de janela única"
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2810,21 +2785,21 @@ msgstr ""
 "strftime na documentação do Python para mais detalhes (http://docs.python."
 "org/3/libray/time.html)."
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Caracteres que são exibidos antes do apelido nas conversas."
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Caracteres que são exibidos após o apelido nas conversas."
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Se ativado, Gajim adicionará * e [n] no título da janela da lista de "
 "contatos."
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
@@ -2832,14 +2807,14 @@ msgstr ""
 "Número de mensagens do histórico a serem restauradas quando a janela ou aba "
 "da conversa é reaberta."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 "Quanto tempo atrás (minutos) o histórico de conversa é restaurado. -1 "
 "significa que não há limite."
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
@@ -2848,16 +2823,16 @@ msgstr ""
 "que você foi desconectado. Definir para 0 irá desabilitar a tentativa de "
 "reconexão."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "Enviar a mensagem com Ctrl+Enter e criar uma nova linha com Enter."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
 "Quantas linhas armazenar com Ctrl+Acima (mensagens enviadas anteriormente)."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -2866,12 +2841,12 @@ msgstr ""
 "Uma URL personalizada com %%s (onde %%s é a palavra/frase) ou "
 "'WIKTIONARY' (que significa: use o Wikitionary)."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
@@ -2879,15 +2854,15 @@ msgstr ""
 "Quando não estiver exibindo a hora para cada mensagem "
 "('print_time'==sometimes), exibi-lo a cada x minutos."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr "Perguntar antes de colar uma imagem."
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
@@ -2895,7 +2870,7 @@ msgstr ""
 "Perguntar antes de fechar uma janela de conversa se ela puder perder dados "
 "(conversa, conversa privada, conferências que não podem ser minimizadas)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -2905,31 +2880,31 @@ msgstr ""
 "interfaces locais, para Transferência de Arquivo no caso de tradução de "
 "endereço/encaminhamento de porta."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Padrão da IEC diz que KiB = 1024 bytes e KB = 1000 bytes."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Notificar eventos no ícone da bandeja do sistema."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Exibir aba quando tiver apenas uma bate papo?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Exibir borda de caderno tabulada nas janelas de conversa?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Exibir botão de fechar na aba?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Pré-visualizar novas mensagens em uma janela popup?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
@@ -2937,7 +2912,7 @@ msgstr ""
 "Uma lista separada por ponto-e-vírgula das palavras que serão destacadas nas "
 "conversas em grupo."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
 "This setting is taken into account only if the notification area icon is "
@@ -2947,7 +2922,7 @@ msgstr ""
 "opção só faz sentido quando a opção de ícone na bandeja do sistema está "
 "sendo usada."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
@@ -2955,15 +2930,7 @@ msgstr ""
 "Se ativado, Gajim esconde a janela da lista de contatos ao pressionar o "
 "botão X em vez de minimizar na área de notificação."
 
-#: gajim/common/config.py:204
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Se ativado, Gajim exibirá um ícone em cada aba contendo mensagens não lidas. "
-"Dependendo do tema, este ícone pode ser animado."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
 "the contact name in the contact list window."
@@ -2971,13 +2938,13 @@ msgstr ""
 "Se ativado, o Gajim indicará a mensagem de estado, se não estiver vazia, sob "
 "o nome de cada contato na lista de contatos."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Define a posição do avatar na lista de contatos. Pode ser esquerda ou direita"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
 "contact changes their status (and/or their status message)."
@@ -2985,7 +2952,7 @@ msgstr ""
 "Se desativado, Gajim não exibirá mensagens de estado nas conversas quando um "
 "contato alterar seu estado e/ou sua mensagem de estado."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
@@ -2993,7 +2960,7 @@ msgstr ""
 "Configuração Padrão: Mostrar mensagem de estado toda vez quando alguém "
 "entrar ou sair da conversa em grupo."
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
@@ -3001,11 +2968,11 @@ msgstr ""
 "Configuração Padrão: Mostrar mensagem de estado para toda mudança de "
 "presença (ausente, não perturbe...) de usuários na conversa em grupo."
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Não exibir a lista de contatos na bandeja do sistema."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3015,7 +2982,7 @@ msgstr ""
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3037,7 +3004,7 @@ msgstr ""
 "'pertype' - Cada tipo de mensagem (ex. bate-papo vs. conferência) são "
 "enviadas para uma janela específica."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3050,31 +3017,31 @@ msgstr ""
 "'nunca' - Nunca mostre janela de lista de contatos.\n"
 "'last_state' - Restaurar o último estado da janela da lista de contatos."
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Se ativado, Gajim mostrará o avatar na janela de conversa."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Se verdadeiro, pressionando a tecla Esc fecha a aba/janela."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Esconder o banner na janela de conferência"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Esconder o banner na janela de conferência"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Esconder a lista dos ocupantes da sala na janela da conferência."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3083,11 +3050,11 @@ msgstr ""
 "Em uma conferência, exibir o apelido no começo da linha apenas quando a "
 "mensagem atual não for da mesma pessoa que mandou a última."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Usar identação ao mesclar apelidos consecutivos."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3096,7 +3063,7 @@ msgstr ""
 "Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
 "aba."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3105,7 +3072,7 @@ msgstr ""
 "Devemos exibir o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos exibir o diálogo."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3114,7 +3081,7 @@ msgstr ""
 "Devemos exibir o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos exibir o diálogo."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3126,7 +3093,7 @@ msgstr ""
 "autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
 "mensagem do seu servidor."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3135,7 +3102,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim exibirá o número de contatos online e do total de "
 "contatos nas linha de conta e grupo."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3144,13 +3111,13 @@ msgstr ""
 "Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
 "última mensagem, se a janela de conversa ainda não estiver aberta."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "O tempo de inatividade necessário antes de fechar a janela de alteração de "
 "status."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3158,11 +3125,7 @@ msgstr ""
 "Número máximo de linhas que são exibidas em conversações. As linhas mais "
 "antigas são apagadas."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Escolha intervalo entre 2 verificações de inatividade."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3171,7 +3134,7 @@ msgstr ""
 "Esquema uri válido. Somente esquemas nesta lista irão ser aceitos como uri "
 "\"real\". (mailto e xmpp são manipulados separadamente)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3179,25 +3142,25 @@ msgstr ""
 "Se verdadeiro, a ação de auto-completar na conferência irá ser como a do "
 "shell"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Opcionalmente corrigir jingle saída de vídeo framerate. Exemplo: 10/1 ou "
 "25/2."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Opcionalmente redimensionar o vídeo de saída do Jingle. Exemplo: 320x240."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 #, fuzzy
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr "Se estiver ativado, você verá o fluxo de vídeo da sua webcam também."
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3206,12 +3169,12 @@ msgstr ""
 "Se estiver ativado, Gajim tentará usar um servidor STUN ao usar jingle. O da "
 "opção \"stun_server\", ou o dado pelo servidor XMPP."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "STUN servidor para usar ao usar Jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3220,7 +3183,7 @@ msgstr ""
 "Se ativado, Gajim mostrará a filiação de participantes do bate-papo em grupo "
 "adicionando um quadrado colorido ao ícone de status."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
@@ -3229,12 +3192,12 @@ msgstr ""
 "Proxy usado para todas as conexões de saída se a conta não tiver um proxy "
 "específico configurado."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 #, fuzzy
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr "Se habilitado, Gajim ignorará os pedidos de atenção recebida ('wizz')."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 #, fuzzy
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
@@ -3243,7 +3206,7 @@ msgstr ""
 "Se habilitado, Gajim reabrirá as janelas de bate-papo que foram abertas da "
 "última vez que Gajim foi fechado."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3252,14 +3215,7 @@ msgstr ""
 "Se habilitado, o Gajim não irá perguntar por mensagem de status. A mensagem "
 "padrão especificada será usada neste caso."
 
-#: gajim/common/config.py:256
-#, fuzzy
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-"Mostre um mini avatar nas abas da janela do bate-papo e como o ícone da "
-"janela."
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3267,23 +3223,23 @@ msgstr ""
 "Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
 "as senhas das contas."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 #, fuzzy
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Se estiver ativado, Gajim executará os Comandos XEP-0146."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 #, fuzzy
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: Sistema, 1: Habilitado, 0: Desativado"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 #, fuzzy
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 "Opções em dias que podem ser escolhidos no menu limite de sincronização"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 #, fuzzy
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
@@ -3292,7 +3248,7 @@ msgstr ""
 "Histórico máximo em dias solicitamos de um arquivo de bate-papo em grupo "
 "público. 0: Tanto quanto possível."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 #, fuzzy
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
@@ -3301,7 +3257,7 @@ msgstr ""
 "Histórico máximo em dias solicitamos de um arquivo de bate-papo em grupo "
 "privado. 0: Tanto quanto possível."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
@@ -3310,7 +3266,7 @@ msgstr ""
 "Se ativado, Gajim mostra o assunto de bate-papo em grupo na janela de bate-"
 "papo ao participar."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3319,7 +3275,7 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3328,7 +3284,7 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3337,7 +3293,7 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3346,7 +3302,7 @@ msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3355,32 +3311,36 @@ msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 #, fuzzy
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr "Preferências api. Valores possíveis: 'http', 'iq'"
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 #, fuzzy
 msgid "Selecting text will copy it to the clipboard"
 msgstr "A seleção de texto irá copiá-lo na prancheta"
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 #, fuzzy
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr "Se habilitado, Gajim executará comandos (/show, /sh, /execute,/exec)."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 #, fuzzy
 msgid "Width of group chat roster in pixel"
 msgstr "Largura da lista de bate-papo em grupo em pixel"
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Adicionar esta sala aos marcadores"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3389,7 +3349,7 @@ msgstr ""
 "A prioridade será alterada automaticamente de acordo com o seu status. As "
 "prioridades são definidas nas opções autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3400,12 +3360,12 @@ msgstr ""
 "inativo, fora, np, invisível. NOTA: esta opção é usada somente se a opção "
 "restore_last_status estiver desativada"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Se habilitado, restaura o último status que foi usado."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
@@ -3413,7 +3373,7 @@ msgstr ""
 "Se verdadeiro, requisição de autorização de contatos  irão ser "
 "automaticamente aceitos."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3421,12 +3381,12 @@ msgid ""
 msgstr ""
 "Se falso, esta conta será desativada e não irá aparecer na lista de contatos."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3435,16 +3395,16 @@ msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 #, fuzzy
 msgid "List of SSL errors to ignore (space separated)."
 msgstr "Lista de erros de SSL para ignorar (espaço separado)."
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
@@ -3455,7 +3415,7 @@ msgstr ""
 "armazenar o histórico de bate-papo. Você também pode adicionar o nome de uma "
 "conta para desativar o histórico de bate-papo para essa conta."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3464,7 +3424,7 @@ msgstr ""
 "Quantos segundos aguardar a resposta do pacote de tempo-de-vida antes de "
 "tentar reconectar."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3473,7 +3433,7 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 #, fuzzy
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
@@ -3483,14 +3443,14 @@ msgstr ""
 "inicialização para ter certeza de que eles funcionam. Os proxies do Openfire "
 "são conhecidos por falhar em este teste, mesmo que funcionem."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Se habilitado, o Gajim não irá perguntar por mensagem de status. A mensagem "
 "padrão especificada será usada neste caso."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3498,16 +3458,16 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Permitir ao Gajim enviar sua hora local."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3516,7 +3476,7 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
@@ -3525,12 +3485,7 @@ msgstr ""
 "Lista de endereços XMPP (espaço separado) para os quais a janela de bate-"
 "papo será reaberta na próxima startup."
 
-#: gajim/common/config.py:349
-#, fuzzy
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr "UPLOAD de arquivos HTTP: habilite a verificação https."
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 #, fuzzy
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
@@ -3540,11 +3495,11 @@ msgstr ""
 "arquivos em uma janela de bate-papo. Pode ser 'httpupload' (padrão) ou "
 "'jingle'."
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr "Permitir verificação de certificado com POSH."
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3553,12 +3508,12 @@ msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Habilitar criptografia ESessions para esta conta."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 #, fuzzy
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
@@ -3566,19 +3521,19 @@ msgstr ""
 "Se ativado, uma notificação é criada para cada mensagem neste bate-papo em "
 "grupo."
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Impossível ingressar na sala"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Impossível ingressar na sala"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 #, fuzzy
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
@@ -3587,7 +3542,7 @@ msgstr ""
 "Se ativado, o bate-papo em grupo é minimizado na lista de contatos ao se "
 "juntar automaticamente."
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
@@ -3596,7 +3551,7 @@ msgstr ""
 "Se ativado, o bate-papo em grupo é minimizado na lista de contatos ao fechá-"
 "lo."
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3605,7 +3560,7 @@ msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3616,84 +3571,84 @@ msgstr ""
 "do Gajim). Esta opção não deve ser usada para (de) ativar plugins. Use a "
 "janela do plugin em vez disso."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Comendo"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Estou trabalhando."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Trabalhando"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefone"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Estou fora"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3702,132 +3657,132 @@ msgstr ""
 "Som para tocar quando uma mensagem MUC conter uma das palavras no "
 "muc_hightlight_words, ou quando uma mensagem MUC contiver seu apelido."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Para"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 #, fuzzy
 msgid "?Group chat description:Project discussion"
 msgstr "? Descrição do bate-papo em grupo:Discussão do projeto"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Salas"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Mensagem destacada de conferência"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 #, fuzzy
 msgid "?Group chat description:Spring gathering"
 msgstr "? Descrição do bate-papo em grupo: Reunião de primavera"
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 #, fuzzy
 msgid "?Group chat address:family"
 msgstr "? Endereço de bate-papo em grupo:família"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Convite para conferência"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 #, fuzzy
 msgid "?Group chat description:Trip planning"
 msgstr "? Descrição do bate-papo em grupo:Planejamento de viagem"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Convite para conferência"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Conferência"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "?Group chat description:Local help group"
 msgstr "? Descrição do bate-papo em grupo:Grupo de ajuda local"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Salas"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "A criação de sala é restrita."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Nova conferência"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "O serviço não pode ser encontrado"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 #, fuzzy
 msgid "Remote server timeout"
 msgstr "Tempo de tempo remoto do servidor"
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
 msgstr "O endereço não pertence a um servidor de chat"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Conta local já existe."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
 msgstr "A sala de bate-papo não existe."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Salas"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 #, fuzzy
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 "Esta mensagem foi criptografada com OTR e não pôde ser descriptografada."
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 #, fuzzy
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
@@ -3837,7 +3792,7 @@ msgstr ""
 "descriptografada. Você pode instalar o plugin PGP para lidar com essas "
 "mensagens."
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 #, fuzzy
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
@@ -3847,929 +3802,929 @@ msgstr ""
 "descriptografada. Você pode instalar o plugin OpenPGP para lidar com essas "
 "mensagens."
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, fuzzy, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 "Esta mensagem foi criptografada com %s e não pôde ser descriptografada."
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Atarefado"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Fazendo compras"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Limpando"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Cozinhando"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Fazendo manutenção"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Lavando a louça"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Lavando roupas"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Fazendo jardinagem"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Realizando uma tarefa"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Passeando com o cachorro"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Bebendo"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Bebendo uma cerveja"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Tomando café"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Tomando chá"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Fazendo um lanche"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Tomando café da manhã"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Jantando"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Almoçando"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Exercitando"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Andando de bicicleta"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Dançando"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Fazendo caminhada"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Correndo"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Praticando esportes"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Correndo"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Esquiando"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Nadando"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Trabalhando fora"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Afagando"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "No Spa"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Escovando os dentes"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Cortando o cabelo"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Fazendo barba"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Tomando banho"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Tomando uma ducha"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Em um compromisso"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inativo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "De folga"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Me descontraindo"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Me escondendo"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Em férias"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Orando"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Feriado"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Pensando"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Relaxando"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Pescando"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Jogando"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Saindo"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Festejando"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Lendo"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Ensaiando"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Comprando"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Fumando"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Socializando"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Tomando banho de sol"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Assitindo TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Assistindo um filme"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Falando"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "No mundo real"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Ao telefone"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Ao telefone"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Viajando"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Em trânsito"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Dirigindo"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "Em um carro"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "Em um ônibus"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "Em um avião"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Em um trem"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Em um passeio"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Andando"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Codificado"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "Em um encontro"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Estudando"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Escrevendo"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Amedrontado"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Surpreso"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Amoroso"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Irado"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Chateado"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Estimulado"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Envergonhado"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Entediado"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Corajoso"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Calmo"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Cauteloso"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Indiferente"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Confidente"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Confuso"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Contente"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Nervoso"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Louco"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Criativo"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Curioso"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Abatido"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Deprimido"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Desapontado"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Enojado"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Consternado"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Distraído"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Envergonhado"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Com inveja"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Excitado"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Paquerador"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustrado"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Agradecido"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Angustiado"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Mal-humorado"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Culpado"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Feliz"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Esperançoso"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Quente"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Humilde"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Humilhado"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Com fome"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Machucado"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Impressionado"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Chocado"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Apaixonado"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Indignado"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Interessado"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Intoxicado"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Invencível"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Envergonhado"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Sozinho"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Perdido"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Sortudo"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Mau"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Mal-humorado"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervoso"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutro"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Ofendido"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Indignado"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Brincalhão"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Orgulhoso"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Relaxado"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Aliviado"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Arrependido"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Inquieto"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Triste"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarcástico"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Satisfeito"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Sério"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Chocado"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Tímido"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Doente"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Com sono"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Espontâneo"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Estressado"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Forte"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Surpreso"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Agradecido"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Com sede"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Cansado"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Fraco"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Preocupado"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 #, fuzzy
 msgid "accuracy"
 msgstr "Precisão"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "alt"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "área"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "marinho"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "Edifício"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "país"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Conta"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 #, fuzzy
 msgid "datum"
 msgstr "Datum"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "descrição"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "erro"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 #, fuzzy
 msgid "floor"
 msgstr "Chão"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "lat"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 #, fuzzy
 msgid "locality"
 msgstr "Localidade"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "au"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 #, fuzzy
 msgid "postalcode"
 msgstr "Postalcode"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "região"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "sala"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "velocidade"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "rua"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "texto"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 #, fuzzy
 msgid "timestamp"
 msgstr "Timestamp"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr "URL"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Não foi possível obter certificado CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Não foi possível descriptografar a assinatura do certificado"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Não foi possível descriptografar a assinatura CRL"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Não foi possível decodificar a chave pública do emissor"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Assinatura do certificado falhou"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Falha na assinatura CRL"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "O certificado ainda não é válido"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "O certificado expirou"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL ainda não é válido"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL expirou"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Erro de formato nos certificados no campo notBefore"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Erro de formato nos certificados no campo notAfter"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erro de formato no campo lastUpdate do CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erro de formato no campo nextUpdate do CRL"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Certificado próprio"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado próprio na cadeia de certificados"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor local"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Não foi possível verificar o primeiro certificado"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "A cadeia de certificados é muito longa"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Certificado CA inválido"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Limite de comprimento do caminho excedido"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Certificado de propósito não suportado"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certificado não confiável"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certificado rejeitado"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Assunto do emissor não coincide"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Chave identificadora de autoridade e assunto não coincidem"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoridade e número serial do emissor não coincidem"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "O uso das chaves não inclui assinatura de certificado"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Verificação do aplicativo falhou"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certificado revocado"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 msgid "Unknown validation error"
 msgstr "Erro desconhecido de validação"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "O certificado expirou"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorização aceita"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Emoticons desabilitados"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "O certificado expirou"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Erro de Criptografia"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Extensão não suportada"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Falha na autenticação com \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4836,12 +4791,12 @@ msgstr "Windows"
 msgid "macOS"
 msgstr "macOS"
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s erro de configuração"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4860,296 +4815,252 @@ msgstr ""
 "Erro foi:\n"
 "%(error)s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 #, fuzzy
 msgid "audio input"
 msgstr "entrada de áudio"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 #, fuzzy
 msgid "audio output"
 msgstr "saída de áudio"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 #, fuzzy
 msgid "video input"
 msgstr "entrada de vídeo"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "O servidor deve estar entre 1 e 1023 bytes"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Caracter inválido no nome do host."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Endereço do servidor é requerido."
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "O nome de usuário deve ser entre 1 e 1023 bytes"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Caracter inválido no nome do usuário."
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "O recurso deve ser entre 1 e 1023 bytes"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Caracter inválido no recurso."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Não disponível"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Não disponível"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "Livre para _conversa"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Livre para conversa"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status da transferência:Parado"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status da transferência:Parado"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Afastado"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Afastado"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Desconectado"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Para"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para inscrição):Nenhuma"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Filiação do contato de conferência:Nenhuma"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 msgid "Owners"
 msgstr "Proprietários"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Dono"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 msgid "Administrators"
 msgstr "Administradores"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 msgid "Members"
 msgstr "Membros"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está digitando..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "parou de digitar"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensagem pendente"
 msgstr[1] "%d mensagens pendentes"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, python-format
 msgid "from group chat %s"
 msgstr "do chat em grupo %s"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " do usuário %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento pendente"
 msgstr[1] "%d eventos pendentes"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Por favor, eu gostaria de adicioná-lo à minha lista."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 #, fuzzy
 msgid "Hello, I am $name."
 msgstr "Olá, estou $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Tempo esgotado ao carregar a imagem"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "A imagem é grande demais"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL ainda não é válido"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "Erro ao carregar a imagem"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um arquivo, mas deveria ser um diretório"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
@@ -5256,85 +5167,85 @@ msgstr "A máquina vai dormir"
 msgid "Disconnect from the network"
 msgstr "Desconectar-se da rede"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "O arquivo está vazio"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, fuzzy, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr "O arquivo é muito grande, o tamanho máximo do arquivo permitido é: %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Criptografia desabilitada"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 #, fuzzy
 msgid "Requesting HTTP File Upload Slot…"
 msgstr "Solicitando http arquivo upload slot..."
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 #, fuzzy
 msgid "Uploading via HTTP File Upload…"
 msgstr "Upload via HTTP Arquivo Upload..."
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Alterar informação de status"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Alterar status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Definir o tipo e a descrição da presença"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Livre para conversa"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Conectado"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Muito afastado"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Não perturbe"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Desconectado"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Descrição da presença:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "O status foi alterado."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Enviar contato: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Enviar contatos:"
 
@@ -5359,7 +5270,7 @@ msgid "Join Automatically"
 msgstr "Junte-se automaticamente"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Conta"
 
@@ -5369,7 +5280,7 @@ msgstr "Chat em Grupo"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 msgid "Password"
 msgstr "Senha"
 
@@ -5392,7 +5303,7 @@ msgstr "em uma c_onferência"
 msgid "Search group chats on selected server"
 msgstr "Bate-papos em grupo de pesquisa no servidor selecionado"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 msgid "Join"
 msgstr "Junte-se"
 
@@ -5409,17 +5320,17 @@ msgid "Time remaining"
 msgstr "Tempo restante"
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -5572,7 +5483,7 @@ msgstr "Informações do contato"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Descrição"
 
@@ -5758,38 +5669,43 @@ msgstr "Trabalho"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Sobre"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Ingressar numa conferência"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Volto logo"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Ingressar"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
 msgstr "Selecionar Conta"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr "_Selecionar"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5862,6 +5778,7 @@ msgid "Strike"
 msgstr "Tachado"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Cor"
 
@@ -5873,136 +5790,131 @@ msgstr "Fonte"
 msgid "Clear formatting"
 msgstr "Limpar Formatação"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Escolha o arquivo para enviar..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Exibe uma lista de emoticons (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Banindo..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 msgid "Enter new nickname"
 msgstr "Entre com um novo apelido"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Alterar _apelido..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Alterar as_sunto"
+
+#: gajim/data/gui/groupchat_control.ui:786
 msgid "Enter password"
 msgstr "Digite a senha"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Sair da conversa em grupo"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Se marcado, o Gajim irá ingressar na conferência no ínicio da aplicação"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Ocorreu um erro:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Verificar novamente..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Participante"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Chutar"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 #, fuzzy
 msgid "Insert Emoji"
 msgstr "Inserir Emoji"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr "Razão (opcional)"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Participante"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Banir"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Nova conferência"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 msgid "_Destroy"
 msgstr "Destruir"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Você também pode entrar com um ponto de encontro alternativo:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Razão"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 #, fuzzy
 msgid "Reason for destruction"
 msgstr "Motivo da destruição"
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 #, fuzzy
 msgid "Where participants should go"
 msgstr "Para onde os participantes devem ir"
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
 msgstr "Entre com um novo nome para o grupo"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Convidar"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Tipo de Evento"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Eventos"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6099,18 +6011,18 @@ msgid "Add"
 msgstr "Adicionar"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 msgid "Remove"
 msgstr "Remover"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 msgid "Resource"
 msgstr "Adicional"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6119,7 +6031,7 @@ msgid "Client"
 msgstr "Cliente"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "Sistema"
 
@@ -6259,28 +6171,17 @@ msgstr "Comportamento da jan_ela:"
 msgid "_Show contact list on startup"
 msgstr "Exibi_r lista"
 
-#: gajim/data/gui/preferences_window.ui:311
-#, fuzzy
-msgid "Show _avatar in chat tabs"
-msgstr "Mostre _avatar em guias de bate-papo"
-
-#: gajim/data/gui/preferences_window.ui:315
-#, fuzzy
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-"Se verificado, o avatar do contato será mostrado nas guias de bate-papo"
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 #, fuzzy
 msgid "_Tabs placement"
 msgstr "colocação _Tabs"
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 #, fuzzy
 msgid "_Quit Gajim when closing contact list"
 msgstr "_Quit Gajim ao fechar a lista de contatos"
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 #, fuzzy
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
@@ -6289,17 +6190,26 @@ msgstr ""
 "Se ativado, Gajim desistirá ao fechar a janela da lista de contatos em vez "
 "de minimizar a área de notificação do sistema"
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 #, fuzzy
 msgid "Behavior of Windows and Tabs"
 msgstr "Comportamento do Windows e guias"
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Mes_clar contas"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Exibir a_vatar dos contatos na lista"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6308,12 +6218,12 @@ msgstr ""
 "Se marcado, Gajim exibirá avatars dos contatos na janela da lista e na "
 "conferência"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Exibir _mensagem de status da lista de contato"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6322,13 +6232,13 @@ msgstr ""
 "Se marcado, Gajim indicará mensagens de status dos contatos sob o nome do "
 "contato na janela da lista e na conferência"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Exibir hum_or dos contatos na lista"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 #, fuzzy
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
@@ -6339,30 +6249,30 @@ msgstr ""
 "mostradas na lista de contatos. Informações adicionais (publicadas via PEP) "
 "podem incluir, por exemplo, humor, atividade, melodia, localização, ..."
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Ordena contatos pelo status"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Enviar contatos:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "em uma c_onferência"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Troca de itens na lista de contatos"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
 msgid "Enable auto copy"
 msgstr "Ativar a cópia automática"
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 #, fuzzy
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
@@ -6371,12 +6281,12 @@ msgstr ""
 "Se ativado, a seleção de texto será copiada para a prancheta, caso "
 "contrário, você pode copiar o texto com CTRL + SHIFT + C"
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Verificador ortográfico"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6389,12 +6299,12 @@ msgstr ""
 "através de um clique com o botão direito no campo de entrada, a linguagem "
 "padrão será usada para este contato ou conferência."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "conteúdos da mensagem"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
@@ -6405,17 +6315,17 @@ msgstr ""
 "mensagem quando foi recebida. Observe que isso não é suportado por todos os "
 "clientes e, portanto, pode ser enganoso."
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Exibe uma lista de formatações"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Exibir _mensagem de status da lista de contato"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6424,27 +6334,27 @@ msgstr ""
 "Se falso, você não verá por mais muito tempo a linha de status nas conversas "
 "quando um contato alterar seu status e/ou sua mensagem de status."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Impossível ingressar na sala"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Impossível ingressar na sala"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Falha ao registrar"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 #, fuzzy
 msgid "Show join/leave (Default)"
 msgstr "Mostrar join/leave (Padrão)"
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 #, fuzzy
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
@@ -6454,7 +6364,7 @@ msgstr ""
 "em grupo. Esta configuração pode ser substituída no menu de bate-papo em "
 "grupo."
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 #, fuzzy
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
@@ -6463,17 +6373,17 @@ msgstr ""
 "O limite de sincronização padrão para novos bate-papos em grupo público. "
 "Esta configuração pode ser substituída no menu de bate-papo em grupo."
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 #, fuzzy
 msgid "Default Sync Threshold"
 msgstr "Limite de sincronização padrão"
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Log mudanças de status dos contatos"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 #, fuzzy
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
@@ -6482,12 +6392,12 @@ msgstr ""
 "Se o status alterar as mensagens é mostrado no bate-papo em grupo. Esta "
 "configuração pode ser substituída no menu de bate-papo em grupo."
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Exibir botão de fechar na aba?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6496,12 +6406,12 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Exibir botão de fechar na aba?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 #, fuzzy
 msgid ""
 "If checked, the contact row will be colored according to the current "
@@ -6510,57 +6420,57 @@ msgstr ""
 "Se verificado, a linha de contato será colorida de acordo com o chatstate "
 "atual do contato"
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 #, fuzzy
 msgid "Show chatstate in banner"
 msgstr "Mostrar chatstate na bandeira"
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
 #, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
 "Se verificado, uma descipação dos contatos atual chatstate é mostrado no "
 "banner"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Último estado"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Conversa"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Quando novo evento é recebido:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Permite janela/notificação quando eu estou _afastado/ND/ocupado/invisível"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Permite janela/notificação quando eu estou _afastado/ND/ocupado/invisível"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifique-me sobre contatos ao _conectar"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6569,11 +6479,11 @@ msgstr ""
 "Gajim notificará você de uma novo evento via uma alerta visual na lateral "
 "inferior direita da tela"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifique-me sobre contatos ao _desconectar"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
@@ -6582,38 +6492,38 @@ msgstr ""
 "Uma janela pop-up sobre contatos que acabaram de sair será mostrado na parte "
 "inferior direita da tela"
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Notificações Visuais"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Tocar _sons"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Gere_nciar..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Permitir som quando eu estiver _ocupado"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 msgid "Sounds"
 msgstr "Sons"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Notificações"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Não disponível"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6622,7 +6532,7 @@ msgstr ""
 "Se marcado, o Gajim irá alterar o status para Não disponível quando o "
 "computador não estiver mais em uso"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6631,7 +6541,7 @@ msgstr ""
 "Se marcado, o Gajim irá alterar o status para Não disponível quando o "
 "computador não estiver mais em uso"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6644,7 +6554,7 @@ msgstr ""
 "$S será substituída pela mensagem de status anterior\n"
 "$T será substituída pela mensagem automática de ausência"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6657,21 +6567,21 @@ msgstr ""
 "$S irá ser substituída pela mensagem de status anterior\n"
 "$T irá ser substituída pela mensagem de ausência automática"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 msgid "Minutes"
 msgstr "Minutos"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Status automático"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 #, fuzzy
 msgid "_Remember and restore status of the last session"
 msgstr "_Remember e restaurar o status da última sessão"
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 #, fuzzy
 msgid ""
 "If checked, the status and status message used in the last session will be "
@@ -6680,20 +6590,20 @@ msgstr ""
 "Se verificado, o status e a mensagem de status utilizados na última sessão "
 "serão restaurados"
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6701,67 +6611,67 @@ msgstr ""
 "Se habilitado, o Gajim não irá perguntar por mensagem de status. A mensagem "
 "padrão especificada será usada neste caso."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Mensagem padrão"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Mensagem de status"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Mensagens de Status Disponíveis"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 msgid "Themes"
 msgstr "Temas"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Configurar cores e fontes da interface"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 #, fuzzy
 msgid "Emojis"
 msgstr "Emojis"
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr "Ícones"
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "_Conjunto de ícones de status:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Usar ícones de _transportes"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6771,74 +6681,74 @@ msgstr ""
 "exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
 "conectado, ausente, ocupado, etc....)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 #, fuzzy
 msgid "_Convert ASCII Emojis"
 msgstr "emojis aSCII _Convert"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Estilo"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Recursos"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "dispositivo de saída A_udio"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "_Audio dispositivo de entrada"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr "Áudio"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr "Vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Mensagem padrão"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "um video"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Vídeo _framerate"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Alternar sessão de vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 #, fuzzy
 msgid "Vi_ew own video source"
 msgstr "Vi_ew própria fonte de vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Conexão"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Servidor:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -6848,52 +6758,62 @@ msgstr ""
 "Gajim vai tentar\n"
 "para descobrir um do servidor. (Exemplo: stun.iptel.org)"
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr "Audio/Video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 #, fuzzy
 msgid "_Global proxy"
 msgstr "_Global procuração"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "Gere_nciar..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Log mudanças de status dos contatos"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 #, fuzzy
 msgid "Enable _debug logging (restart required)"
 msgstr "Permitir _debug exploração madeireira"
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Se marcado, o Gajim irá memorizar a senha para esta conta"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 #, fuzzy
 msgid "Attention: Please use these options with caution!"
 msgstr "Atenção: Por favor, use essas opções com cautela!"
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Editor de configurações avançado"
@@ -7077,12 +6997,12 @@ msgstr "user@example.org"
 msgid "Your password"
 msgstr "Digite a senha"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Ações avançadas"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Usa nome de máquina/porta customizados"
@@ -7169,7 +7089,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Conectar"
@@ -7183,7 +7103,7 @@ msgstr "Crie um novo tema com o nome que você desejar."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7211,8 +7131,8 @@ msgstr "Voltar para as cores _padrões"
 msgid "Resets value to default"
 msgstr "Voltar para as cores _padrões"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -7253,7 +7173,7 @@ msgstr "Certificado próprio"
 msgid "Proxy Host"
 msgstr "Máqu_ina Proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Tipo"
 
@@ -7267,8 +7187,7 @@ msgstr "_Protocolo:"
 msgid "Copy info to clipboard"
 msgstr "_Copiar URL"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Recursos"
 
@@ -7452,6 +7371,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Mudar mensagem de status"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humor:</b>"
@@ -7527,8 +7451,8 @@ msgstr "Instalado"
 #: gajim/data/gui/plugins_window.ui:363
 #, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "A decrição do plug-in deve ser exibida aqui. Este texto será apagado durante "
 "a inicialização do PluginsWindow."
@@ -7713,76 +7637,106 @@ msgstr "Configurações"
 msgid "_Name"
 msgstr "_Nome"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 msgid "Proxy"
 msgstr "Proxy"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Iniciar conversa"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Sair das salas"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Gerenciador de histórico"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Plugins"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Preferências"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr "Sair"
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Contas"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
+#, fuzzy
+msgid "_View"
 msgstr "Ver"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Exibir somente _ativos"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Exibir desc_onectados"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Exibir somente _ativos"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Exibir trans_portes"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Console XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Transferência de Arquivos"
+
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
+#, fuzzy
+msgid "_Help"
 msgstr "Ajuda"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Conectado"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Conectado"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "Atalhos de Teclado"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Recursos"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Sobre"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 #, fuzzy
 msgid "Public or Private?"
@@ -7803,6 +7757,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr "<b>Público:</b> Qualquer um que saiba o endereço pode participar."
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Sair das salas"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8103,59 +8062,67 @@ msgstr "Troca de itens na lista de contatos"
 msgid "Create new group chat"
 msgstr "Sair das salas"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Preferências"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Plugins"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Transferência de arquivos"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "mensagem de status"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Exibir console _XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Aparência"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Exibir desc_onectados"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Exibir somente _ativos"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 #, fuzzy
 msgid "Enable contact list filtering"
 msgstr "Ativar a filtragem da lista de contatos"
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Exibir somente _ativos"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Contatos"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "Informação de contato"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Renomear contato"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "Deletar Contato"
 
@@ -8230,12 +8197,16 @@ msgstr "Preencha o formulário."
 msgid "Group Chat Configuration"
 msgstr "Convite para conferência"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Console XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Iniciar conversa..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 msgid "Filter"
 msgstr "Filtro"
 
@@ -8278,11 +8249,6 @@ msgstr "Exibir todos _eventos pendentes"
 msgid "Mute Sounds"
 msgstr "Sons mudos"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Preferências"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8642,53 +8608,53 @@ msgstr "%(progress)s de %(total)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr "%(minutes)s min %(seconds)s seg"
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
 msgstr "Qualquer pessoa pode participar deste grupo de bate-papo"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Mensagem destacada de conferência"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 #, fuzzy
 msgid "This group chat is restricted to members only"
 msgstr "Este bate-papo em grupo é restrito apenas aos membros"
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Salas"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 #, fuzzy
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 "Todos os outros participantes do bate-papo em grupo podem ver seu endereço "
 "XMPP"
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Mensagem destacada de conferência"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 #, fuzzy
 msgid "Only moderators can see your XMPP address"
 msgstr "Somente os moderadores podem ver seu endereço XMPP"
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 #, fuzzy
 msgid ""
 "Participants entering this group chat need to request permission to send "
@@ -8697,85 +8663,85 @@ msgstr ""
 "Os participantes que entram neste bate-papo em grupo precisam solicitar "
 "permissão para enviar mensagens"
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Salas"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 #, fuzzy
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 "Os participantes que entram neste bate-papo em grupo estão autorizados a "
 "enviar mensagens"
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Mensagem destacada de conferência"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 #, fuzzy
 msgid "Group chat can be found via search"
 msgstr "O bate-papo em grupo pode ser encontrado por meio de pesquisa"
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Esta conferência não tem assunto"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Salas"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 #, fuzzy
 msgid "This group chat does require a password upon entry"
 msgstr "Este bate-papo em grupo requer uma senha após a entrada"
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Salas"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 #, fuzzy
 msgid "This group chat does not require a password upon entry"
 msgstr "Este bate-papo em grupo não requer uma senha na entrada"
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Salas"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 #, fuzzy
 msgid "This group chat persists even if there are no participants"
 msgstr "Este bate-papo em grupo persiste mesmo que não haja participantes"
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 #, fuzzy
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 "Este bate-papo em grupo será destruído assim que o último participante sair"
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Convite para conferência"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "A sessão NÃO SERÁ gravada"
@@ -8804,7 +8770,7 @@ msgid "Sender: %s"
 msgstr "Remetente: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -8963,7 +8929,7 @@ msgstr "Arquivo: "
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar arquivos vazios"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Remetente: "
 
@@ -8978,7 +8944,7 @@ msgid "Change"
 msgstr "Alterar _apelido..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 msgid "Back"
 msgstr "Voltar"
 
@@ -9008,11 +8974,12 @@ msgid "Password Change Failed"
 msgstr "Senha é obrigatória"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Um erro ocorreu durante a criação da conta"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -9049,40 +9016,36 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Erro SSL desconhecido '%s'"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Conversação continuada"
+msgid "Start / Join Chat"
+msgstr "Iniciar conversa"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-msgid "Add Contact"
-msgstr "Adicionar contato"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s não encontrado"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço não respondeu ainda com informação detalhada"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9091,32 +9054,32 @@ msgstr ""
 "Este serviço não pode responder com informações detalhadas.\n"
 "É provável que esteja quebrado"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Outros"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 msgid "Group Chat"
 msgstr "Bate-papo em Grupo"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Você deve estar conectado para visualizar os serviços disponíveis"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar serviços usando conta %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Buscar serviços"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9124,140 +9087,140 @@ msgstr ""
 "Não existe serviço para o endereço que você entrou, ou não está respondendo. "
 "Verifique o endereço e tente novamente."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço não contém nenhum item para navegar."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Nome do servidor inválido"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Explorando %(address)s usando conta %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr "Procurar"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém nenhum item para navegar."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Comandos"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Buscar"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Varrendo %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Usuários"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Nó"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nova postagem"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Enviar mensagem simples"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 msgid "(No subject)"
 msgstr "(Sem assunto)"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples usando conta %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples na conta %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Mensagem simples"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr "Caracteres digitados: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Não é possível enviar uma mensagem para %s, este não é um JID válido."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
@@ -9302,29 +9265,11 @@ msgstr "Registro bem sucedido"
 msgid "Registration failed"
 msgstr "Falha ao registrar"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "O dicionário para o idioma %s não está disponível"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Você precisa instalar o dicionário %s para usar a correção ortográfica ou "
-"selecionar outro idioma definindo a opção speller_language.\n"
-"\n"
-"O recurso de destacar palavras grafadas incorretamente não será usado"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 msgid "Certificate"
 msgstr "Certificado"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
@@ -9333,62 +9278,62 @@ msgstr ""
 "Certificado para conta\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr "Emitido para\n"
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 #, fuzzy
 msgid "Common Name (CN): "
 msgstr "Nome comum (CN):"
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 #, fuzzy
 msgid "Organization (O): "
 msgstr "Organização (O):"
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 #, fuzzy
 msgid "Organizational Unit (OU): "
 msgstr "Unidade Organizacional (UA):"
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 msgid "Serial Number: "
 msgstr "Número do Ticket: "
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr "Emitido por\n"
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr "Validade\n"
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 #, fuzzy
 msgid "Issued on: "
 msgstr "Emitido em:"
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr "Expira em: "
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 #, fuzzy
 msgid "SHA-1:"
 msgstr "SHA-1: SHA-1: SHA-1:"
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 #, fuzzy
 msgid "SHA-256:"
 msgstr "SHA-256: SHA-256: SHA-256:"
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Convite para conferência"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
@@ -9396,7 +9341,7 @@ msgstr ""
 "<b>%(contact)s</b> convidou você para o bate-papo em grupo <b>%(room_jid)s</"
 "b>"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -9411,6 +9356,10 @@ msgstr "Número de GG:"
 msgid "ICQ Number"
 msgstr "Número de ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+msgid "Add Contact"
+msgstr "Adicionar contato"
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9464,9 +9413,9 @@ msgid "Error while adding transport contact"
 msgstr "Erro ao adicionar contato de transporte"
 
 #: gajim/gtk/add_contact.py:486
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9637,31 +9586,51 @@ msgstr "Contato desconectou"
 msgid "Contact Connected Background "
 msgstr "Contato conectado"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Mensagem de status"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Mensagem de status"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Mensagem de status"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Mensagem de status"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 msgid "Invalid Name"
 msgstr "Nome Inválido"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 #, fuzzy
 msgid "Name <b>default</b> is not allowed"
 msgstr "Padrão de <b>nome</b> não é permitido"
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Caractere não permitido"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Você realmente quer excluir a mensagem selecionada?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
@@ -9669,11 +9638,11 @@ msgstr ""
 "Esse é o tema que está atualmente usando.\n"
 "Quer deletá-lo?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 msgid "Delete Theme"
 msgstr "Não é possível excluir o tema."
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Configurações de Acesso"
@@ -9697,10 +9666,9 @@ msgid "Error: %s"
 msgstr "Erro: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Erro"
 
@@ -9714,46 +9682,46 @@ msgstr "Status agora é: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "Abrir"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Novo e-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 msgid "Clear File"
 msgstr "Limpar Arquivo"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Gerenciar perfis de proxy"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Ajustar para status"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "Ligado"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Desligado"
 
@@ -9772,7 +9740,7 @@ msgstr "Conta"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Sua nova conta foi criada com sucesso"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9803,44 +9771,48 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Sincronizar Histórico"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "O que você quer fazer?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "Um mês"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 #, fuzzy
 msgid "Three Months"
 msgstr "Três meses"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Um ano"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "Tudo"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s de %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Baixadas %s Mensagens"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, fuzzy, python-format
 msgid ""
 "Finished synchronising chat history:\n"
@@ -9849,19 +9821,19 @@ msgstr ""
 "Terminou de sincronizar o histórico do bate-papo:\n"
 "%s mensagens baixadas"
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 #, fuzzy
 msgid "Gajim is fully synchronised with the archive."
 msgstr "Gajim está totalmente sincronizado com o arquivo."
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 #, fuzzy
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 "Já existe uma sincronização em curso. Por favor, tente novamente mais tarde."
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Um cliente Jabber GTK+"
@@ -9924,123 +9896,123 @@ msgstr ""
 "Og Maciel <og.maciel@gmail.com>\n"
 "Antonio Morais <antonio_gajim@alfa67.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Escolha o arquivo para enviar..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Escolha imagem"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Todos os arquivos"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Todos os arquivos"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr "Arquivos SVG"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Imagens"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Escolha imagem"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 msgid "ZIP files"
 msgstr "Ficheiros ZIP"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Salvar arquivo como..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 msgid "_Open"
 msgstr "_Abrir"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dessa sala"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Conectado"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
 msgstr "Nome: "
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Download"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Upload"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Transferência do arquivo parada"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?status da transferência:Parado"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?status da transferência:Parado"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Descrição: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?status da transferência:Parado"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?status da transferência:Parado"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?status da transferência:Parado"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?status da transferência:Parado"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?status da transferência:Parado"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?status da transferência:Parado"
@@ -10050,7 +10022,7 @@ msgstr "?status da transferência:Parado"
 msgid " (optional)..."
 msgstr "(opcional)..."
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 msgid "Invalid Address"
 msgstr "Endereço inválido"
 
@@ -10104,23 +10076,23 @@ msgstr "Mensagem destacada de conferência"
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 msgid "Required"
 msgstr "Obrigatório"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Sim"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "Não"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr "Enviar"
 
@@ -10139,11 +10111,6 @@ msgstr "usando conta %s"
 msgid "Hide _Contact List"
 msgstr "Convidar _contatos"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Exibir somente _ativos"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Esconder este menu"
@@ -10192,35 +10159,30 @@ msgid ""
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, fuzzy, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Preferências de arquivamento para %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Preferências"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Preferências"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Você não está conectado ao servidor"
+msgid "Archiving Preferences Error"
+msgstr "_Preferências"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "Erro recebido: {}"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Preferências"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Ativado"
@@ -10274,32 +10236,32 @@ msgstr "?Pergunta (para inscrição):Nenhuma"
 msgid "?password:Hidden"
 msgstr "Senha:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr "Segurança"
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s dias, %(hours)s horas"
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 msgid ""
 "\n"
 "Disabled in preferences"
@@ -10307,16 +10269,16 @@ msgstr ""
 "\n"
 "Desativado nas preferências"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Áudio / Vídeo"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Habilidade para iniciar uma conversa da áudio e vídeo."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 #, fuzzy
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
@@ -10325,13 +10287,13 @@ msgstr ""
 "Requer: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Recurso não disponível no Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10339,22 +10301,22 @@ msgid ""
 msgstr ""
 "Habilidade de medir o tempo de inatividade para definir o status automático."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Requer biblioteca libxss."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 #, fuzzy
 msgid "No additional requirements"
 msgstr "Sem requisitos adicionais"
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10363,58 +10325,58 @@ msgstr ""
 "Conversa sem servidor com clientes detectados automaticamente em uma rede "
 "local."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Requer python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Requer gpg e python-gnupg (%(url)s)."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Configurações de Conexão"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Requer libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Recurso não disponível no Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Notificações"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Habilidade para iniciar uma conversa da áudio e vídeo."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Requer o python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Salvar senha"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
@@ -10423,38 +10385,37 @@ msgstr ""
 "As senhas podem ser armazenadas de maneira segura e não apenas em texto "
 "plano."
 
-#: gajim/gtk/features.py:140
+#: gajim/gtk/features.py:129
 #, fuzzy
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr "Requer: libsecret e um provedor (como GNOME Keyring e KSecretService)"
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Requer gnome-keyring e python-gnome2-desktop ou kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 #, fuzzy
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr "O Windows Credential Vault é usado para armazenamento de senha seguro"
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Verificador ortográfico"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 #, fuzzy
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 "Permite que Gajim faça uma verificação de suas mensagens enquanto compõe"
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Requer libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 #, fuzzy
 msgid "UPnP-IGD Port Forwarding"
 msgstr "UPnP-IGD Porto Forwarding"
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 #, fuzzy
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
@@ -10462,12 +10423,12 @@ msgstr ""
 "Permite que Gajim solicite ao roteador para encaminhar portas para "
 "transferências de arquivos"
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Requer python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Preferências"
@@ -10513,7 +10474,7 @@ msgstr "Nome de lista inválido"
 msgid "You must enter a name to create a privacy list."
 msgstr "Você deve digitar um nome para criar uma lista de privacidade."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Convidar _contatos"
@@ -10543,7 +10504,7 @@ msgstr "Terminar"
 msgid "Commands"
 msgstr "Comandos"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr "Próximo"
 
@@ -10610,119 +10571,133 @@ msgstr "Solicitação de inscrição de %s"
 msgid "Loading"
 msgstr "Carregando"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "_Conectar"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "_Conectar"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Removendo Conta..."
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Clique para mudar a senha da conta"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Conectando..."
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Seu servidor não suporta Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Caractere não permitido"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Seu servidor não suporta Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Falha na conexão"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Criar nova postagem"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "O recurso deve ser entre 1 e 1023 bytes"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Ações avançadas"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Segurança"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Erro SSL desconhecido '%s'"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Remover Conta"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registro para %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Conta"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 msgid "All Accounts"
 msgstr "Todas as Contas"
 
@@ -10761,15 +10736,15 @@ msgstr "Resultado da Pesquisa"
 msgid "No results found"
 msgstr "Nenhum resultado encontrado"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Padrão"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 #, fuzzy
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
@@ -10778,235 +10753,239 @@ msgstr ""
 "<span color=\"red\" font-weight=\"bold\">Indisponível,</span>o suporte de "
 "vídeo será desativado"
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 #, fuzzy
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr "<span color=\"green\" font-weight=\"bold\">OpenGL</span> acelerado"
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 #, fuzzy
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr "<span color=\"yellow\" font-weight=\"bold\">Sem aceleração</span>"
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Re-autenticar agora?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Re-autenticar agora?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 #, fuzzy
 msgid "_Later"
 msgstr "_Later"
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 #, fuzzy
 msgid "_Re-Login"
 msgstr "_Re-Login"
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Por favor verifique se o Avahi ou o Bonjour estão instalados."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Por favor verifique se o Avahi ou o Bonjour estão instalados."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 msgid "Disable Account"
 msgstr "Desativar conta"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Conta inválida"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr "Rótulo"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr "Entrar"
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "Importar Contatos"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Certificado próprio"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onectar na inicialização do Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Salvar his_tórico para todos os contatos desta conta"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 #, fuzzy
 msgid "Store conversations on the harddrive"
 msgstr "Armazenar conversas sobre o disco rígido"
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Totos os status"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Mudar o status da conta ou contas"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Usar proxies de transferência de arquivos"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Ocioso desde:"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 #, fuzzy
 msgid "Disclose the time of your last activity"
 msgstr "Divulgar o tempo de sua última atividade"
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 #, fuzzy
 msgid "Local System Time"
 msgstr "Tempo do sistema local"
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 #, fuzzy
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr "Divulgar o tempo do sistema local do dispositivo Gajim é executado em"
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certificado próprio"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Convidar _contatos"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignore eventos de contatos que não estejam na minha lista"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 #, fuzzy
 msgid "Manually set the hostname for the server"
 msgstr "Definir manualmente o nome de host para o servidor"
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 msgid "Priority"
 msgstr "Prioridade"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_usar variável de ambiente HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Mudar o status da conta ou contas"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 msgid "First Name"
 msgstr "Nome"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 msgid "Email"
 msgstr "E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Ajustar para status"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Habilitar"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 msgid "Port"
 msgstr "Porta"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 msgid "Connection Settings"
 msgstr "Configurações de Conexão"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Certificado próprio"
+
+#: gajim/gtk/accounts.py:817
 #, fuzzy
 msgid "PKCS12 Files"
 msgstr "Arquivos PKCS12"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certificado próprio"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 msgid "Certificate Settings"
 msgstr "Configurações do Certificado"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 msgid "Save Password"
 msgstr "Salvar Senha"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 msgid "Login Settings"
 msgstr "Configurações de Acesso"
 
@@ -11059,19 +11038,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d contato removido"
 msgstr[1] "%d contatos removidos"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Artista desconhecido"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Título desconhecido"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Fonte desconhecida"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11085,22 +11064,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Ma_rcadores para %s"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Arquivo corrompido"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "O arquivo está vazio"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "O serviço enviou dados inválidos"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11160,7 +11139,7 @@ msgstr "org.gajim.Gajim org.gajim.Gajim"
 msgid "Show next pending event"
 msgstr "Exibir todos _eventos pendentes"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
@@ -11170,7 +11149,7 @@ msgstr ""
 "Com gajim você pode conversar através de vários serviços XMPP de sua escolha "
 "(por exemplo, Jabber.org), bem como transportes (por exemplo, Facebook, IRC)."
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
@@ -11178,7 +11157,7 @@ msgstr ""
 "Basta conversar com seus amigos ou familiares, facilmente compartilhar fotos "
 "e pensamentos ou discutir as notícias com seus grupos."
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
@@ -11186,51 +11165,51 @@ msgstr ""
 "Gajim se integra bem com seus outros dispositivos: basta conversar e ver o "
 "que foi dito em seu dispositivo móvel."
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 msgid "Features:"
 msgstr "Características:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 "Nunca perca uma mensagem, mantenha todos os seus clientes de bate-papo "
 "sincronizados"
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr "Convide amigos para conversar em grupo ou participe de um"
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr "Envie facilmente fotos, vídeos ou outros arquivos para amigos e grupos"
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 "Converse com segurança com criptografia de ponta a ponta via OMEMO ou OpenPGP"
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr "Use seus emoticons favoritos, defina sua própria foto de perfil"
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr "Mantenha e gerencie todo o seu histórico de bate-papo"
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr "Organize seus bate-papos com guias"
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Verificação ortográfica das mensagens escritas."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr "Conecte-se a outros Mensageiros via Transportes (Facebook, IRC, ...)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
@@ -11238,62 +11217,216 @@ msgstr ""
 "Pesquise coisas na Wikipédia, dicionários ou outros mecanismos de busca "
 "diretamente da janela de bate-papo"
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 "Defina sua atividade, sintonia e humor para mostrar aos seus amigos como "
 "você está se sentindo"
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr "Suporte para várias contas"
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr "Agrupar vários contatos de um amigo para um único Meta-Contact"
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr "Console XML para ver o que está acontecendo na camada de protocolo"
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 #, fuzzy
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr "Mensagens sem servidor (Bonjour/Zeroconf), BOSH"
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Descoberta de serviço incluindo nós, pesquisa de usuário"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr "Ainda mais recursos através de plugins"
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Lista de contatos"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr "Janela de bate-papo tabbed"
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Salas"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 msgid "Chat history"
 msgstr "Histórico"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Falha ao registrar"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Conversação continuada"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "Simular a perda de conectividade"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "Simular a volta de conectividade"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Erro de SSL desconhecido: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "Requer: libsecret e um provedor (como GNOME Keyring e KSecretService)"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Escolha intervalo entre 2 verificações de inatividade."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "O dicionário para o idioma %s não está disponível"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Você precisa instalar o dicionário %s para usar a correção ortográfica ou "
+#~ "selecionar outro idioma definindo a opção speller_language.\n"
+#~ "\n"
+#~ "O recurso de destacar palavras grafadas incorretamente não será usado"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Reconectar"
+
+#~ msgid "Quit"
+#~ msgstr "Sair"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Exibir somente _ativos"
+
+#~ msgid "Add to Contact List"
+#~ msgstr "Adicionar à sua lista de contatos"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Convidar _contatos"
+
+#~ msgid "Configure Group Chat"
+#~ msgstr "Configurar grupo de bate-papo"
+
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Destruir conferência"
+
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Se ativado, Gajim exibirá um ícone em cada aba contendo mensagens não "
+#~ "lidas. Dependendo do tema, este ícone pode ser animado."
+
+#, fuzzy
+#~ msgid "Show a mini avatar in chat window tabs and as the window's icon."
+#~ msgstr ""
+#~ "Mostre um mini avatar nas abas da janela do bate-papo e como o ícone da "
+#~ "janela."
+
+#, fuzzy
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "Mostre _avatar em guias de bate-papo"
+
+#, fuzzy
+#~ msgid "If checked, the contact's avatar will be shown in chat tabs"
+#~ msgstr ""
+#~ "Se verificado, o avatar do contato será mostrado nas guias de bate-papo"
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "O servidor deve estar entre 1 e 1023 bytes"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Caracter inválido no nome do host."
+
+#~ msgid "Server address required."
+#~ msgstr "Endereço do servidor é requerido."
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "O nome de usuário deve ser entre 1 e 1023 bytes"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Caracter inválido no nome do usuário."
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "O recurso deve ser entre 1 e 1023 bytes"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Caracter inválido no recurso."
+
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Cor da notificação para contatos conectando."
+
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Cor da notificação para contatos desconectando."
+
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Cor da notificação para novas mensagens."
+
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "Cor da notificação para pedido de transferência de arquivo."
+
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "Cor da notificação de erros na transferência de arquivos."
+
+#~ msgid "Notification color for stopped or completed file transfers."
+#~ msgstr ""
+#~ "Cor de notificação para transferências de arquivos paradas ou concluídas."
+
+#~ msgid "Notification color for group chat invitations."
+#~ msgstr "Cor de notificação para convites de conversa em grupo."
+
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Cor de fundo da notificação de mudança de estado."
+
+#~ msgid "Notification color for other dialogs."
+#~ msgstr "Cor de notificação para outros diálogos."
+
+#~ msgid "Event Type"
+#~ msgstr "Tipo de Evento"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Eventos"
+
+#, fuzzy
+#~ msgid "HTTP File Upload: Enable HTTPS Verification."
+#~ msgstr "UPLOAD de arquivos HTTP: habilite a verificação https."
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Você não está conectado ao servidor"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Conflito de recurso"
 
@@ -11963,9 +12096,6 @@ msgstr "Falha ao registrar"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Enviar mensagem privada"
 
-#~ msgid "Send _File"
-#~ msgstr "Enviar _arquivo"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Participantes"
@@ -14722,9 +14852,6 @@ msgstr "Falha ao registrar"
 #~ "você pode selecionar outra aqui.\n"
 #~ "Considere a possível modificação das regras do seu firewall."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Mes_clar contas"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP não disponível neste computador"
 
@@ -15221,9 +15348,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Requer python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Requer gnome-keyring e python-gnome2-desktop ou kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/ru.po b/po/ru.po
index 442125d48..bc96ec9e0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2013-09-21 13:55+0300\n"
 "Last-Translator: Fomin Denis <fominde@gmail.com>\n"
 "Language-Team: Linux Support LLC\n"
@@ -25,72 +25,78 @@ msgstr ""
 "X-Poedit-Basepath: /home/test/gajim\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Учётные записи"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "и заверено"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "и НЕ заверено"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s шифрование включено %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Очистить"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr "Вставить как цитату"
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 msgid "Paste Image"
 msgstr "Вставить изображение"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Вы собираетесь закрыть несколько вкладок"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Вы точно хотите вставить изображение из буфера обмена в окно чата?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "Не _спрашивать меня снова"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr "_Вставить"
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Список доступа"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 "Если вы пошлете файл — <b>%s</b> станет известен ваш настоящий Jabber ID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -152,214 +158,216 @@ msgstr "Нет ожидающего запроса на подписку."
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Показать контакты не в сети"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Вы не возражаете, если я добавлю Вас в контакт-лист?"
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Отправить одиночное _сообщение..."
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 msgid "E_xecute Command…"
 msgstr "В_ыполнить команду..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 msgid "_Rename…"
 msgstr "П_ереименовать..."
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Разблокировать"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Блокировать"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Удалить"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Информация о контакте"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Отправить файл..."
+#: gajim/gui_menu_builder.py:517
+#, fuzzy
+msgid "Send File"
+msgstr "Отправить _файл"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Сохранить файл как..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 msgid "Send File Directly…"
 msgstr "Отправить файл напрямую…"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Последнее состояние"
 
-#: gajim/gui_menu_builder.py:523
-msgid "Invite Contacts"
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
+#, fuzzy
+msgid "Invite Contacts…"
 msgstr "Пригласить участников"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "Добавить контакт..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Запрос аудио сеанса"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Тест видео"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 msgid "Information"
 msgstr "Информация"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 msgid "History"
 msgstr "История"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Отключены"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Только печатает"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "При любых изменениях"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Пригласить участников"
+msgid "All Chat States"
+msgstr "При любых изменениях"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Покинуть конференции"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Покинуть конференции"
-
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
-msgstr "Изменить тему"
+msgid "Rename…"
+msgstr "П_ереименовать..."
 
-#: gajim/gui_menu_builder.py:579
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Configure Group Chat"
-msgstr "Покинуть конференции"
+msgid "Change Subject…"
+msgstr "Изменить тему"
 
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "Загрузить аватар…"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Новая комната"
+msgid "Configure…"
+msgstr "Настроить"
+
+# смотря где вылазит меседж - нужно присмотреться
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Удаление %s"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Сочетания клавиш в чате"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+#, fuzzy
+msgid "Show Join/Leave"
 msgstr "Показать присоединиться / уйти"
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "Показывать изменения _статуса"
 
-#: gajim/gui_menu_builder.py:586
-msgid "Notify on all messages"
+#: gajim/gui_menu_builder.py:584
+#, fuzzy
+msgid "Notify on all Messages"
 msgstr "Уведомлять о всех сообщениях"
 
-#: gajim/gui_menu_builder.py:587
-msgid "Minimize on close"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Minimize on Close"
 msgstr "Сворачивать при закрытии"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "_Сворачивать при автовходе"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr "Порог синхронизации"
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Изменить _ник..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 msgid "Request Voice"
 msgstr "Запросить право говорить"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
-msgid "Execute command"
-msgstr "Выполнить команду"
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
+#, fuzzy
+msgid "Execute Command…"
+msgstr "В_ыполнить команду..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr "Покинуть"
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr "Порога нет"
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -367,264 +375,267 @@ msgstr[0] "%i день"
 msgstr[1] "%i дней"
 msgstr[2] "%i дня"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Только печатает"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "При любых изменениях"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "Добавить контакт..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Профиль"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Отправить одиночное _сообщение..."
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
 msgstr "Просмотреть сервисы"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 msgid "Server Info"
 msgstr "Данные о сервере"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "Настройки Архивации"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Черный список"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Конфигурация"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "Synchronise History…"
 msgstr "Синхронизировать историю"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Админ"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Отправить сообщение сервера..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Установить сообщение дня..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Обновить сообщение дня..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Удалить сообщение дня"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "Добавить контакт..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Редактировать учетную запись"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Редактировать учетную запись"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Учётные записи"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Скопировать JID/почтовый адрес"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Войти в комнату"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Начать чат"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "Добавить контакт..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Копировать адрес ссылки"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Просмотреть ссылку в браузере"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Скопировать JID/почтовый адрес"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Отправить письмо"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Копировать адрес ссылки"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Местоположение: "
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Скопировать JID/почтовый адрес"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "_Пригласить"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Разблокировать"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Блокировать"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Выгнать"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Забанить"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Владелец"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Админ"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Участник"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Участник"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr "Разрешить голос"
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "Запросить право говорить"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Копировать JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Использование:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Параметры:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "показать это сообщение и закончить работу"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr "Выберите папку для файла журнала"
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Не могу найти базу данных истории"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "Файл %s не существует."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "Адрес AIM:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -632,28 +643,28 @@ msgstr "Дата"
 msgid "Nickname"
 msgstr "Ник"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Сообщение"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Тема"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Очистка базы данных"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "создается БД истории"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -666,28 +677,28 @@ msgstr ""
 "\n"
 "Если вы нажали ДА, пожалуйста подождите..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Очистить"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Вы"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s сказал: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Удалить"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -695,7 +706,7 @@ msgstr[0] "Подтверждение удаления"
 msgstr[1] "Подтверждение удаления"
 msgstr[2] "Подтверждение удаления"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -703,7 +714,7 @@ msgstr[0] "Удалить без возможности восстановлен
 msgstr[1] "Удалить эти беседы без возможности восстановления?"
 msgstr[2] ""
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -711,7 +722,7 @@ msgstr[0] "Сообщение по умолчанию"
 msgstr[1] "Сообщение по умолчанию"
 msgstr[2] "Сообщение по умолчанию"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -719,234 +730,238 @@ msgstr[0] "Вы точно хотите удалить выделенное со
 msgstr[1] "Вы точно хотите удалить выделенные сообщения?"
 msgstr[2] "Вы точно хотите удалить выделенные сообщения?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Имя контакта: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr "XMPP-адрес: <i>%s</i>"
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Общие"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Группа"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "В группе"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Установить настроение"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Нет"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Сообщение о статусе %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Сообщение о статусе"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 #, fuzzy
 msgid "Overwrite"
 msgstr "Перезаписать?"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Изменить сообщение о статусе?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Это имя уже используется. Перезаписать это сообщение о статусе?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Перезаписать?"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Сообщение о статусе"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Сохранить как предустановленное сообщение..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Введите имя для этого сообщения о статусе"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Сохранить _как"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Статус"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Имя"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Учётная запись не подключена к серверу"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Вы не можете синхронизировать учетную запись если она не подключена."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Синхронизировать"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "аудио и видео"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "аудио"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "видео"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s хочет начать %(type)s сеанс с вами. Вы хотите ответить?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Отправить файл..."
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Отправить файл (макс. %s МиБ)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Не удалось произвести передачу файлов"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Неверный файл"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Выгоняем %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, python-format
 msgid "Ban %s"
 msgstr "Заблокировать %s"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Запрос аудио сеанса"
 
-#: gajim/groupchat_control.py:830
-#, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+#: gajim/groupchat_control.py:831
+#, fuzzy, python-format
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr "<b>%s</b> из <b>%s</b> запросов голоса"
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr "_Подтвердить"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s установил(а) тему: %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Теперь в комнате отображаются недоступные участники"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "теперь в комнате не отображаются недоступные участники"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr "Была изменена настройка, не связанная с конфиденциальностью"
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "История сеанса БУДЕТ сохранена на сервере"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Информация о вас, сохраненная на сервере"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Конференция не анонимна"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Конференция частично анонимна"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Конференция полностью анонимна"
@@ -961,7 +976,7 @@ msgstr "Pong! (%s сек.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s сек.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Ошибка."
 
@@ -990,22 +1005,22 @@ msgstr "Новая комната была создана"
 msgid "Failed to Configure Group Chat"
 msgstr "Покинуть конференции"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} теперь зовётся {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Вы теперь {show} {status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} теперь {show} {status}"
@@ -1130,52 +1145,52 @@ msgstr "Вы точно хотите выйти из этой комнаты?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Если вы закроете это окно, то вы выйдете из комнаты '%s'."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr "Пок_инуть"
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s был приглашен в комнату"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Показать список форматирования"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Этот контакт не поддерживает HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s состояние : %(state)s, причина: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s из комнаты %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, python-format
 msgid ""
 "You just received a new message from %s.\n"
@@ -1184,28 +1199,28 @@ msgstr ""
 "Получено новое сообщение от %s.\n"
 "Закрыть эту вкладку?"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "Отправить и _закрыть"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Новое сообщение"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "Отправить и _закрыть"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1214,184 +1229,175 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s теперь %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Передача файлов"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Размер"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_Принять"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Отключен"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Открыть папку с принятым файлом"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Приглашение в комнату"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Удаленный контакт остановил передачу"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Ошибка открытия файла"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Передача файла остановлена"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Передача отменена"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Отображать значок в области уведомлений:"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "показывать только сообщения об ошибках"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 "Разделить файлы профиля полностью (даже историю базы данных и плагинов)"
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Выводить xml станзы и другую отладочную информацию"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Использовать определенный профиль из каталога с настройками"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Установить каталог загрузки конфигурации"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Настройки системы логирования"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показать непросмотренные _события"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "Открыть оболочку IPython"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Показывать окно со следующим непрочитанным сообщением"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Начать чат"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr "Имитировать потерю связи"
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr "Имитировать восстановление подключения"
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Транспорты"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Комнаты"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Была отправлена авторизация"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Авторизация была удалена"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
@@ -1401,7 +1407,7 @@ msgstr "Теперь «%s» всегда будет видеть вас в оф�
 msgid "desynced"
 msgstr "не синхронизировано"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1421,7 +1427,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Всегда закрывать Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Выйти"
@@ -1581,8 +1588,8 @@ msgstr "Переименовать группу %s?"
 msgid "Please enter a new name"
 msgstr "Создайте новую тему с желаемым названием."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "П_ереименовать"
@@ -1601,28 +1608,33 @@ msgstr "Вы точно хотите удалить группу %s из рос�
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Покинуть конференции"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Введите новое имя пользователя для локальной учетной записи"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Переименовать контакт"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Удаляет контакт из ростера"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr ""
 "Вы собираетесь удалить «%(name)s» (%(jid)s) из вашего списка контактов.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1631,21 +1643,21 @@ msgstr ""
 "Удаляя контакт, вы удалите и авторизацию, то есть они всегда будут видеть "
 "вас в оффлайне."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Удаляет контакт из ростера"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1658,25 +1670,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Переименовать контакт"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1684,12 +1696,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Эта информация не будет "
 "сохранена при следующем подключении."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1700,21 +1712,21 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Переименовать контакт"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Творческий"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1722,100 +1734,100 @@ msgstr[0] "Хотите отправить файл %s:\n"
 msgstr[1] "Хотите отправить файлы %s:\n"
 msgstr[2] "Хотите отправить файлы %s:\n"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Отправить"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Отправить %s контакту %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "Сделать %s первым контактом"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Отправлять Местоположение"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редактировать _группы"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "П_ереименовать"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Переподсоединиться"
+#: gajim/roster_window.py:5116
+msgid "Execute command"
+msgstr "Выполнить команду"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_История"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1945,70 +1957,70 @@ msgstr "Личные беседы"
 msgid "Messages"
 msgstr "Сообщения"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Вы принимаете запрос %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Была отправлена авторизация"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Была отправлена авторизация"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Нет"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Соединение разорвалось"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Запрос подписки"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Запрос подписки"
 
-#: gajim/gui_interface.py:354
-#, python-format
-msgid "%s (%s) has removed subscription from you"
+#: gajim/gui_interface.py:328
+#, fuzzy, python-format
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "%s (%s) отозвал вашу подписку"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2017,148 +2029,148 @@ msgstr ""
 "Вы всегда будете видеть его или её как отключенными.\n"
 "Удалить его или её из контакт-листа?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "От подписки отказался"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s отклонил приглашение: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s отклонил приглашение"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Вы приглашены в конференцию {room} пользователем {user}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сервер требует сертификат TLS"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Введите пароль для сертификата учетной записи %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Удаленный контакт остановил передачу"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Ошибка открытия файла"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Ошибка SSL сертификата"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Не удалось произвести передачу файлов"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Передача файла %(filename)s от %(name)s не удалась."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Передача файла %(filename)s от %(name)s не удалась."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Передача файла %(filename)s к %(name)s не удалась."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Введите новое имя пользователя для локальной учетной записи"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_ОК"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хочет начать видео сеанс."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Запрос аудио сеанса"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Небезопасное соединение"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2170,20 +2182,20 @@ msgstr ""
 "подключения не рекомендуется.\n"
 "Вы действительно хотите это сделать?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr "_Прервать"
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Соединяюсь"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr "Gajim: Оболочка IPython"
 
@@ -2389,11 +2401,11 @@ msgstr "Для выбранного метода шифрования не су�
 msgid "Avatar Upload Failed"
 msgstr "Публикация vCard не удалась"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы больше не находитесь в комнате «%(room)s» или «%(nick)s» вышел."
@@ -2727,28 +2739,23 @@ msgstr ""
 "Аргумент «%(arg)s» не задан. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s должен быть файлом, а не директорией"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, python-format
 msgid "Creating %s"
 msgstr "Создаём %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Неизвестная ошибка SSL: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2756,50 +2763,50 @@ msgstr[0] "Новое сообщение от %(nickname)s"
 msgstr[1] "Новое сообщение от %(nickname)s"
 msgstr[2] "Новое сообщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Новая комната"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s меняет статус"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключается"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s отключается"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Ошибка аутентификации с «%s»"
@@ -2873,64 +2880,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Уведомлять о контактах, которые _вошли"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Уведомлять о контактах, которые _вышли: "
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Показывать _уведомления при получении сообщений"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Уведомить меня, когда передача файлов закончится"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Уведомить меня, когда передача файлов закончится"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr "Цвет уведомления для остановленных или завершенных передач файлов."
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr "Цвет уведомления для приглашений группового чата."
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Фоновый цвет контакта, который только что вошел."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr "Цвет уведомления для других диалоговых окон."
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "По_умолчанию"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Язык, используемый при проверке правописания"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2940,15 +2905,15 @@ msgstr ""
 "«sometimes» — печатать время каждые несколько минут.\n"
 "«never» — не печатать время."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr "При включении смайлы ASCII будут преобразованы в графические смайлики."
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Обрабатывать пары * / _ как возможные форматирующие символы."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2957,7 +2922,7 @@ msgstr ""
 "Если активно, то не будут удаляться */_. Так что *фыва* будет написано "
 "полужирным шрифтом, но * * удалены не будут"
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2966,7 +2931,7 @@ msgstr ""
 "Символ, который нужно добавлять к нику, когда используется дополнение (tab) "
 "в комнате."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2975,7 +2940,7 @@ msgstr ""
 "Символ, который будет добавляться после ника, когда желаемый ник уже занят "
 "кем-нибудь в комнате."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
@@ -2984,12 +2949,12 @@ msgstr ""
 "при его скрытии и восстановит его при повторном отображении окна списка "
 "контактов."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 #, fuzzy
 msgid "Place the contact list on the right in single window mode"
 msgstr "Расположить ростер справа в однооконном режиме"
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3001,23 +2966,23 @@ msgstr ""
 "К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно "
 "документацию python к strftime (http://docs.python.org/lib/module-time.html)"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Символы, которые будут отображаться перед никами в чате."
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Символы, которые будут отображаться после ников в чате"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3026,14 +2991,14 @@ msgstr ""
 "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
 "вновь."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 "Как далеко назад во времени (минуты) история чата восстанавливается. -1 "
 "означает отсутствие ограничений."
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3043,19 +3008,19 @@ msgstr ""
 "комнату, от которой вы были отключены. Чтобы отключить автоматический вход в "
 "этом случае, установите значение 0."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
 "Mirabilis ICQ)"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Сколько строк хранить для Ctrl+Стрелка вверх"
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3064,13 +3029,13 @@ msgstr ""
 "Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или "
 "«WIKTIONARY», чтобы использовать Викисловарь."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
 "gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3079,15 +3044,15 @@ msgstr ""
 "Если отключена печать времени для каждого сообщения, то печатать его каждые "
 "X минут."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr "Спросить перед вставкой изображения."
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3097,7 +3062,7 @@ msgstr ""
 "элемент, который может потерять данные (разговор, личный разговор, разговор "
 "в комнате, которые не будут свёрнуты)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3107,31 +3072,31 @@ msgstr ""
 "локальным интерфейсам при передаче файлов в случае, если мы за NAT или "
 "используется перенаправление портов."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандарт утверждает, что KiB = 1024 байт, KB = 1000 байт"
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Уведомлять о событиях в области уведомлений."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Показывать вкладку при одном чат-окне?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показывать границу вкладки в окне чата?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Предпросмотр новых сообщений во всплывающем окне?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3139,7 +3104,7 @@ msgid ""
 msgstr ""
 "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3150,7 +3115,7 @@ msgstr ""
 "окна. Эта опция учитывается, только если используется иконка в области "
 "уведомлений."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
@@ -3158,16 +3123,7 @@ msgstr ""
 "Если этот параметр включен, Gajim скрывает окно списка контактов при нажатии "
 "кнопки X вместо сворачивания в область уведомлений."
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Если активно, то Gajim отображает иконку на каждой вкладке, которая содержит "
-"непрочитанные сообщения. В зависимости от темы, она может быть анимированной."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3176,13 +3132,13 @@ msgstr ""
 "Если активно то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Определяет позицию аватар в ростере. Может быть left или right"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3191,26 +3147,26 @@ msgstr ""
 "Если неактивно, то Gajim больше не будет показывать строку статуса в окне "
 "беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Не получается войти в комнату"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Не получается войти в комнату"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Не показывать ростер в панели задач."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3220,7 +3176,7 @@ msgstr ""
 "мигать (поведение по умолчанию для большинства менеджеров окон) когда "
 "присутствуют не просмотренные события."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3241,7 +3197,7 @@ msgstr ""
 "свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
 "Gajim, чтобы изменения вступили в силу."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3254,32 +3210,32 @@ msgstr ""
 "'never' - Никогда не показывать ростер.\n"
 "'last_state' - Восстанавливать последнее состояние ростера."
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Если неактивно, вы больше не будете видеть аватары в окне беседы."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Если активно, то нажатие клавиши Escape будет закрывать вкладку/окно."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Скрывает баннер в окне комнаты"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Скрывает баннер в окне комнаты"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Скрывает список посетителей в окне комнаты."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3288,13 +3244,13 @@ msgstr ""
 "Показывать ник в начале строки в чате только если предыдущее сообщение было "
 "написано другим участником."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Разделитель, используемый при активированной настройке "
 "chat_merge_consecutive_nickname."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3303,7 +3259,7 @@ msgstr ""
 "Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым "
 "сообщением, когда нет непрочитанных сообщений."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3312,7 +3268,7 @@ msgstr ""
 "Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3321,7 +3277,7 @@ msgstr ""
 "Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3333,7 +3289,7 @@ msgstr ""
 "если вы подключитесь с отрицательным приоритетом, то вы НЕ получите никаких "
 "сообщений от сервера."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3342,7 +3298,7 @@ msgstr ""
 "Если активно, Gajim будет показывать количество контактов онлайн/всего в "
 "строках с названием учетной записи и групп."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3351,21 +3307,17 @@ msgstr ""
 "Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам "
 "сообщение последним, если окно чата еще небыло открыто."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Время не активности прежде чем окно изменения статуса закроется."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "Максимальное количество строк в окне. Старые строки будут удалены."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Выберите интервал между 2 проверками на бездействие."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3374,7 +3326,7 @@ msgstr ""
 "Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» "
 "uri.(mailto и xmpp обрабатываются отдельно)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3382,22 +3334,22 @@ msgstr ""
 "Если активно, автодополнение ников в конференциях будет работать как "
 "автодополнение в командной оболочке"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Опциональное изменение частоты кадров видео в jingle. Например: 10/1 или 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Опциональное изменение размера кадра видео в jingle. Например: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr "Если этот параметр включен,вы также увидите видеопоток с веб-камеры."
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3406,12 +3358,12 @@ msgstr ""
 "Если включено, Gajim попробует использовать STUN сервер с jingle. Либо "
 "указанный опцией \"stun_server\", либо предоставленный jabber сервером."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "Сервер STUN для использования с jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3420,7 +3372,7 @@ msgstr ""
 "Если включено, Gajim покажет принадлежность пользователей группового чата, "
 "добавив цветные квадраты к значку статуса"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
@@ -3429,13 +3381,13 @@ msgstr ""
 "Прокси используется для всех исходящих соединений, если в настройках учетной "
 "записи не задан прокси "
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 "Если этот параметр включен, Gajim будет игнорировать входящие запросы "
 "внимания ('wizz')."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3443,7 +3395,7 @@ msgstr ""
 "Если этот параметр включен, Gajim снова откроет окна чата, которые были "
 "открыты в прошлый раз, когда Gajim был закрыт."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3452,11 +3404,7 @@ msgstr ""
 "Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
 "будет использовано соответствующее сообщение по умолчанию."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr "Показывать мини-аватар на вкладках окна чата и в качестве значка окна."
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3464,19 +3412,19 @@ msgstr ""
 "Если активно, Gajim будет использовать Systems Keyring для хранения паролей "
 "учетных записей."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Если этот параметр включен, Gajim будет выполнять команды XEP-0146."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: Система, 1: Включено, 0: Отключено"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr "Параметры в днях, которые можно выбрать в меню порог синхронизации"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
@@ -3484,7 +3432,7 @@ msgstr ""
 "Максимальная история в днях, которую мы запрашиваем из публичного архива "
 "группового чата. 0: как можно больше."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
@@ -3492,7 +3440,7 @@ msgstr ""
 "Максимальная история в днях, которую мы запрашиваем из личного архива "
 "группового чата. 0: как можно больше."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
@@ -3500,7 +3448,7 @@ msgstr ""
 "Если этот параметр включен, Gajim показывает тему группового чата в окне "
 "чата при присоединении."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3509,7 +3457,7 @@ msgstr ""
 "Если отмечено, то Gajim будет разрешать определять время в системе, которую "
 "вы используете"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3518,7 +3466,7 @@ msgstr ""
 "Если отмечено, то Gajim будет разрешать определять время в системе, которую "
 "вы используете"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3527,7 +3475,7 @@ msgstr ""
 "Если отмечено, то Gajim будет разрешать определять время в системе, которую "
 "вы используете"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3536,7 +3484,7 @@ msgstr ""
 "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
 "(только печать), disabled (никаких уведомлений)."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3545,30 +3493,34 @@ msgstr ""
 "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
 "(только печать), disabled (никаких уведомлений)."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr "Настройки API. Возможные значения: 'http', 'iq'"
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr "При выборе текста он будет скопирован в буфер обмена"
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 "Если включено, то Gajim будет выполнять команды (/show, /sh, /execute, /"
 "exec)."
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr "Ширина списка групповых чатов в пикселях"
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Добавить комнату в закладки"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3577,7 +3529,7 @@ msgstr ""
 "Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты "
 "для статусов задаются в пункте autopriority_* ."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3587,12 +3539,12 @@ msgstr ""
 "Статус, используемый при автоподключении. Варианты: отключен, в сети, готов "
 "поболтать, отошел, недоступен, не беспокоить, невидимка"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Если включено, восстанавливать последний использованный статус."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
@@ -3600,7 +3552,7 @@ msgstr ""
 "Если активно, контакты, запрашивающие авторизацию, будут автоматически её "
 "получать."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3609,12 +3561,12 @@ msgstr ""
 "Если неактивно, эта учетная запись будет отключена и не будет отображаться в "
 "окне ростера."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Вы не подключены к серверу"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3623,15 +3575,15 @@ msgstr ""
 "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
 "через незащищенное соединение. Может быть 'warn', 'connect', 'disconnect'"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr "Список ошибок SSL, которые нужно игнорировать (через пробел)."
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
@@ -3641,7 +3593,7 @@ msgstr ""
 "историю чата. Вы также можете добавить имя учетной записи, чтобы отключить "
 "хранение истории чата для этой учетной записи."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3650,7 +3602,7 @@ msgstr ""
 "Время ожидания (в секундах) ответа на пинг перед повторной попыткой "
 "соединения."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3659,7 +3611,7 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
@@ -3668,30 +3620,30 @@ msgstr ""
 "файлов при запуске, чтобы убедиться, что они работают. Прокси Openfire, как "
 "известно, не проходят этот тест, даже если они работают."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
 "будет использовано соответствующее сообщение по умолчанию."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Разрешить Gajim отправлять информацию о операционной системе, которую вы "
 "используете"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Разрешить Gajim отправлять ваше локальное время."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Сообщение отправляемое контактам, которых вы хотите добавить"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3700,7 +3652,7 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
@@ -3708,11 +3660,7 @@ msgstr ""
 "Список адресов XMPP (разделенных пробелом), для которых окно чата будет "
 "повторно открыто при следующем запуске."
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr "Загрузка файлов HTTP: включить проверку HTTPS."
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
@@ -3720,11 +3668,11 @@ msgstr ""
 "Предпочтительный механизм передачи файлов для перетаскивания файлов в окне "
 "чата. Может быть 'http upload' (по умолчанию) или 'jingle'."
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr "Подтверждение SSL сертификата при помощи POSH"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3733,31 +3681,31 @@ msgstr ""
 "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
 "(только печать), disabled (никаких уведомлений)."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Включить ESessions шифрование для данной учетной записи."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 "Если этот параметр включен, уведомление создается для каждого сообщения в "
 "этом групповом чате."
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Не получается войти в комнату"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Не получается войти в комнату"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
@@ -3765,7 +3713,7 @@ msgstr ""
 "Если этот параметр включен, то при автоматическом присоединении групповой "
 "чат сворачивается в список контактов."
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
@@ -3773,7 +3721,7 @@ msgstr ""
 "Если этот параметр включен, то при закрытии групповой чат сворачивается в "
 "список контактов."
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3782,7 +3730,7 @@ msgstr ""
 "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
 "(только печать), disabled (никаких уведомлений)."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3793,84 +3741,84 @@ msgstr ""
 "опция НЕ ДОЛЖНА использоваться для включения или выключения модулей. "
 "Используйте графический интерфейс для этого."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Ем"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Работаю"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "В кино"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Работаю"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Работаю"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Вышел"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Пока!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3880,124 +3828,124 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "Отсутствует"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Комнаты"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Вас упомянули в комнате"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Приглашение в комнату"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Приглашение в комнату"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Комната"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Комнаты"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "Отсутствует"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Создание комнат запрещено."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Новая комната"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Сервис не обнаружен"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr "Тайм-аут удаленного сервера"
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
 msgstr "Адрес не принадлежит серверу комнат"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Учётная запись Local уже существует."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
 msgstr "Комнаты не существует."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "История конференций"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 "Это сообщение было зашифровано с помощью OTR и не может быть расшифровано."
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -4005,7 +3953,7 @@ msgstr ""
 "Это сообщение было зашифровано с помощью устаревшего OpenPGP и не может быть "
 "расшифровано. Вы можете установить плагин PGP для обработки этих сообщений."
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
@@ -4014,924 +3962,924 @@ msgstr ""
 "расшифровано. Вы можете установить плагин OpenPGP для обработки этих "
 "сообщений."
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 "Это сообщение было зашифровано с помощью %s и не может быть расшифровано."
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Занимаюсь хозяйством"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Покупаю продукты"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Делаю уборку"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Готовлю"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Ремонт"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Мою посуду"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Стираю"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Работаю в саду"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Ушёл по поручению"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Гуляю с собакой"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Пью"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Пью пиво"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Пью кофе"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Пью чай"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Перекусываю"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Завтракаю"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Обедаю"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Ланч"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Занимаюсь спортом"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "На велосипеде"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Танцы"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "В походе"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Пробежка"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Спортивные игры"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Бегу"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Катаюсь на лыжах"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Плаваю"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Тренировка"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Уход за собой"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "В spa салоне"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Чищу зубы"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Делаю прическу"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Бреюсь"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Принимаю ванну"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Принимаю душ"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Встреча"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Неактивен"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Выходной день"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Гуляю"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Прячусь"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Молюсь"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Запланированный отпуск"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Размышления"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Отдыхаю"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Рыбалка"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Играю"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Вышел"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "На вечеринке"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Читаю"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Репетиция"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Покупки"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Курю"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Общаюсь"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Загораю"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Смотрю ТВ"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Смотрю кино"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Разговариваю"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "В реальной жизни"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Говорю по телефону"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Говорю по видео телефону"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Путешествую"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Еду с работы/на работу"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Вождение"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "В машине"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "В автобусе"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "В самолёте"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "В поезде"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "В поездке"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Прогулка"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Пишу программу"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "На совещании"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Учусь"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Пишу"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Испуганный"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Изумлённый"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Влюбчивый"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Сердитый"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Раздражённый"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Озабоченный"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Возбуждённый"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Пристыженный"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Скучающий"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Храбрый"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Невозмутимый"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Осторожный"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Мерзнущий"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Уверенный"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Смущенный"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Задумчивый"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Довольный"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Раздражительный"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Сумасшедший"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Творческий"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Любознательный"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Удрученный"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Подавленный"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Разочарованный"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Чувствующий отвращение"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Потрясенный"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Растерянный"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Смущенный"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Завистливый"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Взволнованный"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Кокетливый"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Неудовлетворенный"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Признательный"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Скорбящий"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Сердитый"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Виноватый"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Счастливый"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Надеющийся"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Жарко"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Скромный"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Униженный"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Голодный"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Раненый"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Впечатлённый"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Благоговеющий"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Влюблённый"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Возмущённый"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Заинтересованный"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Пьяный"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Непобедимый"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Ревнивый"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Одинокий"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Потерянный"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Удачливый"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Подлый"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Капризный"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Нервный"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Нейтральный"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Обиженный"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Оскорбленный"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Игривый"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Гордый"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Расслабленный"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Облегчённый"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Раскаявшийся"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Неугомонный"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Грустный"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Язвительный"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Удовлетворенный"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Серьёзный"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Шокированный"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Застенчивый"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Больной"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Сонный"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Спонтанный"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Напряженный"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Сильный"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Удивлённый"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Благодарный"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Жаждущий"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Усталый"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Неопределенный"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Слабый"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Волнующийся"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 #, fuzzy
 msgid "accuracy"
 msgstr "Точность значения"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "высота"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "район"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "направление"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "строение"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "страна"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "код страны"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "Данные"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "описание"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "error"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "этаж"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "широта"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "населенный пункт"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "долгота"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "индекс"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "область"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "комната"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "скорость"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "улица"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "текст"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "время установки"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Не удалось получить сертификат издателя"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Не удалось получить сертификат CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Не удалось расшифровать подпись сертификата"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Не удалось расшифровать подпись CRL"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Не удалось расшифровать открытый ключ издателя"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Ошибка подписи сертификата"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Ошибка подписи CRL"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Сертификат ещё не действителен"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Сертификат просрочен"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL ещё не действителен"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL просрочен"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Ошибка в поле notBefore сертификата"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Ошибка в поле notAfter сертификата"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Ошибка в поле «lastUpdate» CRL"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Ошибка в поле «nextUpdate» CRL"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Сертификат подписан самим владельцем."
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Самостоятельно подписанный сертификат в цепочке сертификатов"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Не удалось получить сертификат локального издателя"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Не удалось подтвердить первый сертификат"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Цепочка сертификатов слишком длинная"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Сертификат аннулирован"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Недопустимый сертификат CA"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Превышено ограничение по длине пути"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Неподдерживаемое назначение сертификата"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Сертификат не является доверенным"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Сертификат отклонен"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Несоответствие поставщика сертификата"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификаторы ключа центра сертификации и владельца не совпадают"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Идентификаторы ключа центра сертификации и издателя не совпадают"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Назначение ключа не включает подписывание сертификата"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Ошибка при проверке приложения"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Сертификат аннулирован"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Неизвестная ошибка SSL: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Сертификат просрочен"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Авторизация принята"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Учетная запись отключена"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Сетевые учётные сведения"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Ошибка шифрования"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Расширение не поддерживается"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Ошибка аутентификации с «%s»"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4993,12 +4941,12 @@ msgstr "Windows"
 msgid "macOS"
 msgstr "macOS"
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "ошибка конфигурации %s"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -5017,223 +4965,190 @@ msgstr ""
 "Ошибка:\n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "звуковой вход"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "звуковой выход"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "видео вход"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Имя сервера должно быть от 1 до 1023 символов"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Неверный символ в имени сервера"
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Требуется адрес сервера."
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Имя должно быть от 1 до 1023 символов"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Неверный символ в имени пользователя."
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "Имя ресурса должно быть от 1 до 1023 символов"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Неверный символ в ресурсе"
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Занят"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Занят"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Готов поболтать"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Готов поболтать"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "Д_оступен"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "Доступен"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Ушел"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Ушел"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Отключен"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "Ошибка"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "Нет"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "К"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "От"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Оба"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "Неизвестна"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "Нет"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "Отсутствует"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Участники"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Посетители"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Отсутствует"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Владелец"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Владелец"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "печатает сообщение..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "перестал печатать сообщение"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5241,22 +5156,22 @@ msgstr[0] "%d пропущенное сообщение"
 msgstr[1] "%d пропущенных сообщения"
 msgstr[2] "%d пропущенных сообщений"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, python-format
 msgid "from group chat %s"
 msgstr "в комнатах %s"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " от пользователя %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " от %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5264,48 +5179,37 @@ msgstr[0] "%d событие пропущено"
 msgstr[1] "%d события пропущено"
 msgstr[2] "%d событий пропущено"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim — %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт-лист?"
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Привет, я $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Не могу загрузить изображение"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Изображение слишком большое"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "PyCURL не установлен"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "Ошибка загрузки изображения"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s должен быть директорией, а не файлом"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Закончить работу"
 
@@ -5409,83 +5313,83 @@ msgstr "Компьютер перешел в спящий режим"
 msgid "Disconnect from the network"
 msgstr "Отключиться от сети"
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Пустой файл"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Файл не существует"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr "Файл слишком большой, максимально допустимый размер файла: %s"
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 msgid "Encrypting file…"
 msgstr "Шифруем файл…"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 #, fuzzy
 msgid "Requesting HTTP File Upload Slot…"
 msgstr "Запрашиваем слот для загрузки по HTTP…"
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Изменить информацию о статусе"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Контакт изменит статус"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Установка статуса и статусного сообщения"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Готов поболтать"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "В сети"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Недоступен (расширенный)"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Не беспокоить."
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Не в сети — отключен"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Описание присутствия:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Статус изменён."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Контакт для отправки: «%s» (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Контакты для отправки:"
 
@@ -5508,7 +5412,7 @@ msgid "Join Automatically"
 msgstr "Присоединяться автоматически"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Учетные записи"
 
@@ -5519,7 +5423,7 @@ msgstr "Комнаты"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -5544,7 +5448,7 @@ msgstr "в _комнатах"
 msgid "Search group chats on selected server"
 msgstr "Искать комнаты на этом сервере"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Присоединиться"
@@ -5563,17 +5467,17 @@ msgid "Time remaining"
 msgstr "Оставшееся время"
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "О_тменить"
 
@@ -5720,7 +5624,7 @@ msgstr "Информация о контакте"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Описание"
 
@@ -5922,39 +5826,44 @@ msgstr "Работа"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Подробнее"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Войти в комнату"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Скоро буду"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Присоединиться"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
 msgstr "Выбрать учётную запись"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "Очистить"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -6024,6 +5933,7 @@ msgid "Strike"
 msgstr "Зачеркнутый"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Цвет"
 
@@ -6036,135 +5946,131 @@ msgstr "Шрифт"
 msgid "Clear formatting"
 msgstr "Удалить форматирование"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Выбрать сертификат"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Показать набор смайлов (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Баню..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 msgid "Enter new nickname"
 msgstr "Введите новый ник"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Изменить ник"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Изменить тему"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Введите новый пароль"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Покинуть конференции"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Если отмечено, то Gajim будет входить в комнату при запуске"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Произошла ошибка:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Удостоверить снова..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Участник"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Выгнать"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr "Вставить Emoji"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Можете указать альтернативную комнату:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Участник"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Забанить"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Новая комната"
 
 # смотря где вылазит меседж - нужно присмотреться
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Удаление %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Можете указать альтернативную комнату:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Причина"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr "Причина разрушения"
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr "Куда должны идти участники"
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 msgid "Enter a new name for this group chat"
 msgstr "Введите новое имя для группового чата"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "_Пригласить"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Тип события"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Описание события"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6260,20 +6166,20 @@ msgid "Add"
 msgstr "Добавить"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Удалить"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Статус"
 
@@ -6283,7 +6189,7 @@ msgid "Client"
 msgstr "Клиент:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "Система"
 
@@ -6423,25 +6329,15 @@ msgstr "Поведение _окна:"
 msgid "_Show contact list on startup"
 msgstr "Показ_ывать ростер при запуске:"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr "Показать _аватар в вкладках чата"
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-"Если этот флажок установлен, аватар контакта будет отображаться во вкладках "
-"чата"
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr "Размещение _вкладок"
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr "_Выход из Gajim при закрытии списка контактов"
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
@@ -6449,16 +6345,25 @@ msgstr ""
 "Если этот параметр включен, Gajim завершит работу при закрытии окна списка "
 "контактов вместо сворачивания в область уведомлений системы"
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr "Поведение окон и вкладок"
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Объединить учетные записи"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Показывать а_ватары для контактов в ростере"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6467,12 +6372,12 @@ msgstr ""
 "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
 "в окнах комнат"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Показывать _сообщения о статусе контакта в ростере"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6481,7 +6386,7 @@ msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера и в окнах комнат"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
@@ -6489,7 +6394,7 @@ msgstr ""
 "Показывать дополнительную информацию контактов в ростере (занятие, "
 "настроение, ...)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
@@ -6500,29 +6405,29 @@ msgstr ""
 "информация (публикуемая через PEP) может включать, например, настроение, "
 "активность, мелодию, местоположение..."
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Сортировать контакты по статусу"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Контакты для отправки:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "в _комнатах"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Обмен контактами"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr "Включить автоматическое копирование"
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
@@ -6531,12 +6436,12 @@ msgstr ""
 "обмена, в противном случае вы можете скопировать текст с помощью CTRL + "
 "SHIFT + C"
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Проверка орфографии"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6548,12 +6453,12 @@ msgstr ""
 "окон чата. Если язык проверки явно не задан, будет использован язык по "
 "умолчанию для данного контакта или комнаты."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "содержимое сообщения"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
@@ -6563,17 +6468,17 @@ msgstr ""
 "отображаться небольшая галочка. Обратите внимание, что это не поддерживается "
 "всеми клиентами и поэтому может ввести в заблуждение."
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Показать список форматирования"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Показывать _сообщения о статусе контакта в ростере"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6582,26 +6487,26 @@ msgstr ""
 "Если неактивно, то Gajim больше не будет показывать строку статуса в окне "
 "беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Не получается войти в комнату"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Не получается войти в комнату"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Сочетания клавиш в чате"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr "Показать соединение / выход (по умолчанию)"
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
@@ -6609,7 +6514,7 @@ msgstr ""
 "Если в групповом чате отображаются сообщения о состоянии присоединиться/"
 "покинуть. Этот параметр можно переопределить в меню группового чата."
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
@@ -6617,16 +6522,16 @@ msgstr ""
 "Порог синхронизации по умолчанию для новых публичных групповых чатов. Этот "
 "параметр можно переопределить в меню группового чата."
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr "Порог Синхронизации по умолчанию"
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "Показывать изменения _статуса"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
@@ -6634,12 +6539,12 @@ msgstr ""
 "Если в групповом чате отображаются сообщения об изменении статуса. Этот "
 "параметр можно переопределить в меню группового чата."
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6648,12 +6553,12 @@ msgstr ""
 "Если отмечено, то Gajim будет разрешать определять время в системе, которую "
 "вы используете"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
@@ -6661,54 +6566,55 @@ msgstr ""
 "Если флажок установлен, строка контакта будет окрашена в соответствии с "
 "текущим состоянием чата контакта"
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr "Показать состояние чата в баннере"
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
 "Если флажок установлен, в баннере отображается описание текущего состояния "
 "чата контактов"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Последнее состояние"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Чаты"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Отображать значок в области уведомлений:"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Когда получено новое событие:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "Показывать уведомления когда окно чата открыто"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "Позволять уведомления в режиме _ушел/недоступен/занят/невидимка"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомлять о контактах, которые _вошли"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
@@ -6716,11 +6622,11 @@ msgstr ""
 "Всплывающее окно о контактах, которые только что вошли в систему, будет "
 "показано в правом нижнем углу экрана "
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомлять о контактах, которые _вышли: "
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
@@ -6728,39 +6634,39 @@ msgstr ""
 "Всплывающее окно о контактах, которые только что вышли, будет показано в "
 "правом нижнем углу экрана "
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Уведомления"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Проигрывать звук, когда я _занят"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "В формате Wav"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Недоступен"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6769,7 +6675,7 @@ msgstr ""
 "Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго "
 "не используется"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6778,7 +6684,7 @@ msgstr ""
 "Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго "
 "не используется"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6792,7 +6698,7 @@ msgstr ""
 "$T заменяется на время срабатывания автоматического сообщения о статусе "
 "«Ушел»"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6806,21 +6712,21 @@ msgstr ""
 "$T заменяется на время срабатывания автоматического сообщения о статусе "
 "«Недоступен»"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "минут"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Авто статус"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr "_Запомнить и восстановить состояние последнего сеанса"
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
@@ -6828,20 +6734,20 @@ msgstr ""
 "Если этот флажок установлен, состояние и сообщение о состоянии, "
 "использованные в последнем сеансе, будут восстановлены"
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Запрашивать сообщение о статусе, когда я: "
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "В_ошел"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "В_ышел"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6849,67 +6755,67 @@ msgstr ""
 "Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
 "будет использовано соответствующее сообщение по умолчанию."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Сообщение по умолчанию"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Включено"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Сообщение о статусе"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Предустановленные сообщения о статусе"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Тема"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Тема"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Настроить цвет и шрифт интерфейса"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr "Emojis"
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr "Иконки"
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Тема статусных _иконок:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Использовать иконки _транспортов"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6919,75 +6825,75 @@ msgstr ""
 "(например, контакты из MSN будут иметь соответствующие иконки msn для "
 "статусов «в сети», «ушёл», «занят» и т.д.)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr "_Конвертировать ASCII смайлики"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Стиль"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Возможности"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Устройство вывода звука"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Устройство захвата звука"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Тест звука"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Тест видео"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Устройство захвата изображения"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "видео выход"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Частота кадров видео"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Разрешение видео"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 #, fuzzy
 msgid "Vi_ew own video source"
 msgstr "Источник слоя Мозаика"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Соединение"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "STUN сервер:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -6996,51 +6902,61 @@ msgstr ""
 "Адрес сервера STUN. Если не указано, Gajim попробует\n"
 "получить адрес с сервера."
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Звук / Изображение"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 #, fuzzy
 msgid "_Global proxy"
 msgstr "Глобальный прокси:"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Управление..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Записывать в лог изменения статусов контактов"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr "Включить _ведение журнала отладки (требуется перезапуск)"
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr "Открывает папку, содержащую журналы отладки"
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Прочее"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr "Внимание: пожалуйста, используйте эти опции с осторожностью!"
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Расширенный редактор настроек"
@@ -7221,12 +7137,12 @@ msgstr "user@example.org"
 msgid "Your password"
 msgstr "Введите новый пароль"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Дополнительные действия"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Использовать пользовательские хост/порт"
@@ -7312,7 +7228,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "В_ошел"
@@ -7326,7 +7242,7 @@ msgstr "Создайте новую тему с желаемым названи�
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7354,8 +7270,8 @@ msgstr "_Сбросить до исходных"
 msgid "Resets value to default"
 msgstr "_Сбросить до исходных"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост: "
@@ -7398,7 +7314,7 @@ msgstr "Просмотреть журнал"
 msgid "Proxy Host"
 msgstr "Хост прокси:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Тип"
 
@@ -7412,8 +7328,7 @@ msgstr "_Протокол:"
 msgid "Copy info to clipboard"
 msgstr "_Копировать адрес ссылки"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Возможности"
 
@@ -7596,6 +7511,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Изменить сообщение о статусе"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Настроение:</b>"
@@ -7672,9 +7592,10 @@ msgid "Installed"
 msgstr "Установленные"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr "Описание модуля. Эта строка будет стерта при загрузке модуля."
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7860,75 +7781,107 @@ msgstr "Сочетания клавиш в чате"
 msgid "_Name"
 msgstr "_Имя: "
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Прокси:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Начать чат"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Покинуть конференции"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Менеджер истории"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Модули"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Настройки"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Выйти"
+msgid "_Accounts"
+msgstr "Учётные записи"
 
 #: gajim/data/gui/application_menu.ui:39
-msgid "View"
+#, fuzzy
+msgid "_View"
 msgstr "Вид"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Показать только активных"
 
 #: gajim/data/gui/application_menu.ui:46
-msgid "Show Offline Contacts"
+#, fuzzy
+msgid "Show _Offline Contacts"
 msgstr "Показать отключенных"
 
 #: gajim/data/gui/application_menu.ui:50
-msgid "Show Active Contacts"
+#, fuzzy
+msgid "Show _Active Contacts"
 msgstr "Показать только активных"
 
 #: gajim/data/gui/application_menu.ui:54
-msgid "Show Transports"
+#, fuzzy
+msgid "Show _Transports"
 msgstr "Показать Транспорты"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Консоль XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Передача файлов"
+
 #: gajim/data/gui/application_menu.ui:74
-msgid "Help"
+#, fuzzy
+msgid "_Help"
 msgstr "Помощь"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "В сети"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "В сети"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "Сочетания клавиш"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Возможности"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Подробнее"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr "Публичный или приватный?"
@@ -7946,6 +7899,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr "<b>Публичный:</b> любой, кто знает адрес, может присоединиться."
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Покинуть конференции"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8231,56 +8189,64 @@ msgstr "Сочетания клавиш в чате"
 msgid "Create new group chat"
 msgstr "Покинуть конференции"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Настройки"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Модули"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Передача файлов"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "сообщение о статусе"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Показать консоль _XML"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Оформление"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 msgid "Show offline contacts"
 msgstr "Показать контакты не в сети"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Показать _только активных"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr "Включить фильтрацию списка контактов"
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Показать _только активных"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Контакты"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 msgid "Contact information"
 msgstr "Информация о контакте"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 msgid "Rename contact"
 msgstr "Переименовать контакт"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 msgid "Delete contact"
 msgstr "Удалить контакт"
 
@@ -8356,12 +8322,16 @@ msgstr "Заполните форму."
 msgid "Group Chat Configuration"
 msgstr "Приглашение в комнату"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Консоль XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Начать беседу..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Фильтр:"
@@ -8407,11 +8377,6 @@ msgstr "Показать непросмотренные _события"
 msgid "Mute Sounds"
 msgstr "Выключить звук"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Настройки"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8754,48 +8719,48 @@ msgstr "%(progress)s из %(total)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "Отсутствует"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
 msgstr "Кто угодно может зайти в эту комнату"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Вас упомянули в комнате"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr "Этот групповой чат доступен только для участников"
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Комнаты"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr "Все остальные участники группового чата могут видеть ваш адрес XMPP"
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Вас упомянули в комнате"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr "Только модераторы могут видеть ваш адрес XMPP"
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "Отсутствует"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
@@ -8803,76 +8768,76 @@ msgstr ""
 "Участники, входящие в этот групповой чат, должны запросить разрешение на "
 "отправку сообщений"
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Комнаты"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr "Участники, входящие в этот групповой чат, могут отправлять сообщения"
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Вас упомянули в комнате"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr "Групповой чат можно найти через поиск"
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "Отсутствует"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "У этой комнаты нет темы"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Комнаты"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr "Этот групповой чат требует пароля при входе"
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Комнаты"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr "Этот групповой чат не требует пароля при входе"
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Комнаты"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr "Этот групповой чат сохраняется даже при отсутствии участников"
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "Отсутствует"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr "Этот групповой чат будет уничтожен после ухода последнего участника"
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Приглашение в комнату"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "История сеанса БУДЕТ сохранена на сервере"
@@ -8901,7 +8866,7 @@ msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Получатель:"
 
@@ -9052,7 +9017,7 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Отправитель:"
 
@@ -9067,7 +9032,7 @@ msgid "Change"
 msgstr "Изменить ник"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Скоро буду"
@@ -9098,11 +9063,12 @@ msgid "Password Change Failed"
 msgstr "Требуется пароль"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Произошла ошибка при создании учетной записи"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Изменить пароль"
 
@@ -9137,40 +9103,35 @@ msgstr "Ошибка при попытке проверки SSL сертифик
 msgid "Unknown SSL error '%s'"
 msgstr "Неизвестная ошибка SSL '%s'"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Возобновлённая беседа"
+msgid "Start / Join Chat"
+msgstr "Начать чат"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "Добавить контакт..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s не найден"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Этот сервис еще не сообщил информацию о себе"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9179,33 +9140,33 @@ msgstr ""
 "Этот сервис не может предоставить подробную информацию о себе. \n"
 "Скорее всего, он устарел или сломан"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Другие"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Комнаты"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подключиться к серверу"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор сервисов с учётной записи %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Обзор сервисов (discovery)"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Сервис не обнаружен"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9213,140 +9174,140 @@ msgstr ""
 "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
 "попробуйте еще раз."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Сервис недоступен для просмотра"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Неверное имя сервера"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Просмотр %(address)s с учетной записью %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 msgid "Browse"
 msgstr "Просмотреть"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 msgid "_Command"
 msgstr "_Команда"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "За_регистрироваться"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Поиск"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Правка"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Сканирую %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Пользователи"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Подписка"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Узел"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Новое сообщение"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Отправить одиночное сообщение"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "тема"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Сообщение"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr "Введённые символы: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Соединение недоступно"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Не удалось передать сообщение %s — этот JID неверен."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
@@ -9394,30 +9355,12 @@ msgstr "Регистрация завершена"
 msgid "Registration failed"
 msgstr "Ошибка регистрации"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Нет словаря для языка %s"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Чтобы воспользоваться проверкой правописания, установите словарь для языка "
-"\"%s\" или выберите другой язык, исправив настройку speller_language.\n"
-"\n"
-"Слова с ошибками подсвечиваться не будут"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Сертификат Владельца"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
@@ -9426,64 +9369,64 @@ msgstr ""
 "Сертификат учетной записи\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr "Выдано для\n"
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr "Общее имя (CN): "
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr "Организация (O): "
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr "Подразделение организации (OU): "
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Номер GaduGadu"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr "Выдано\n"
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr "Достоверность\n"
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr "Выдано: "
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "Истекает"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr "SHA-1:"
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr "SHA-256:"
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Приглашение в комнату"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "<b>%(contact)s</b> приглашает вас в комнату <b>%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
@@ -9498,6 +9441,11 @@ msgstr "Номер GaduGadu"
 msgid "ICQ Number"
 msgstr "Номер ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "Добавить контакт..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9550,9 +9498,9 @@ msgid "Error while adding transport contact"
 msgstr "Ошибка при добавлении службы"
 
 #: gajim/gtk/add_contact.py:486
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9714,31 +9662,51 @@ msgstr "Контакт отключился"
 msgid "Contact Connected Background "
 msgstr "Контакт подключился"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Сообщение о статусе"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Сообщение о статусе"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Сообщение о статусе"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Сообщение о статусе"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Неверное имя пользователя"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Символ недопустим"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Вы точно хотите удалить выделенное сообщение?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
@@ -9746,12 +9714,12 @@ msgstr ""
 "Эта тема используется в данный момент.\n"
 "Удалить эту тему?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Активен"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Модули"
@@ -9775,10 +9743,9 @@ msgid "Error: %s"
 msgstr "Ошибка: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Ошибка"
 
@@ -9792,44 +9759,44 @@ msgstr "Статус установлен в: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 msgid "Open"
 msgstr "Открыть"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Все файлы"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 msgid "Clear File"
 msgstr "Очистить"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
 msgstr "Управление профилями прокси"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Прокси:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 msgid "Adjust to Status"
 msgstr "В зависимости от статуса"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "Включено"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Выключено"
 
@@ -9848,7 +9815,7 @@ msgstr "Учетная запись"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Ваша новая учетная запись успешно создана"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9879,60 +9846,64 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Синхронизировать историю"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Что вы хотите сделать?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "Один год"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Соединяюсь"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s из %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Загружено %s Сообщений"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Jabber/XMPP-клиент на GTK+"
@@ -9993,120 +9964,120 @@ msgstr ""
 "Денис Фомин (fominde@mail.ru)\n"
 "Григорий Сарницкий (sargrigory@ya.ru)"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 msgid "Choose File to Send…"
 msgstr "Выбрать файл для отправки..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Выбрать Архив"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 msgid "PNG files"
 msgstr "PNG файлы"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 msgid "JPEG files"
 msgstr "JPEG файлы"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 msgid "SVG files"
 msgstr "SVG файлы"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Картинки"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Выбрать Архив"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Zip файлы"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 msgid "Save File as…"
 msgstr "Сохранить файл как..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "Открыть"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s этой комнаты"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Подключен"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Отключен"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
 msgstr "Имя файла:"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Скачать"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Загрузить"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Передача файла остановлена"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Приостановлено"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Приостановлено"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Описание: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Приостановлено"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Приостановлено"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Приостановлено"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Приостановлено"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Приостановлено"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Приостановлено"
@@ -10115,7 +10086,7 @@ msgstr "Приостановлено"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Неверный файл"
@@ -10171,27 +10142,27 @@ msgstr "Вас упомянули в комнате"
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Требуемый пакет:"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "Yes"
 msgstr "Да"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Нет"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "О_тменить"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10210,11 +10181,6 @@ msgstr "используя учетную запись %s"
 msgid "Hide _Contact List"
 msgstr "Пригласить _участников"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Показать только активных"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
@@ -10260,35 +10226,30 @@ msgid ""
 msgstr ""
 "При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Настройки архивации для %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Настройки Архивации"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "Настройки архивации сохранены!"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Вы не подключены к серверу"
+msgid "Archiving Preferences Error"
+msgstr "Настройки Архивации"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "Получена ошибка: {}"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "Настройки Архивации"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Активно"
@@ -10337,32 +10298,32 @@ msgstr "Нет"
 msgid "?password:Hidden"
 msgstr "Пароль:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr "Безопасность"
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 msgid ""
 "\n"
 "Disabled in preferences"
@@ -10370,16 +10331,16 @@ msgstr ""
 "\n"
 "Отключено в настройках"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Звук / Изображение"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Возможность голосового и видео общения."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 #, fuzzy
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
@@ -10388,13 +10349,13 @@ msgstr ""
 "Требует gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and "
 "gstreamer1.0-plugins-ugly."
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Эта возможность отсутствует в Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10403,21 +10364,21 @@ msgstr ""
 "Возможность определения времени бездействия для того, чтобы установить "
 "автостатус."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Требует библиотеку libxss."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10426,105 +10387,102 @@ msgstr ""
 "Не требующее сервера общение между автоматически обнаруживаемыми клиентами в "
 "локальной сети."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Требует gir1.2-gupnpigd-1.0."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Требует pybonjour и bonjour SDK (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Соединение"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Требует Gspell"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Эта возможность отсутствует в Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Уведомления"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Возможность голосового и видео общения."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Требует python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Сохранить пароль"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Пароли могут храниться безопасно, а не просто открытым текстом."
 
-#: gajim/gtk/features.py:140
+#: gajim/gtk/features.py:129
 #, fuzzy
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
-"Требует libsecret и какой-либо менеджер ключей(GNOME Keyring или "
-"KSecretService)."
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Требует gnome-keyring и python-gnome2-desktop или kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Проверка орфографии"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Требует Gspell"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 #, fuzzy
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr "Возможность запроса порта для передачи файлов у роутера."
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Требует gir1.2-gupnpigd-1.0."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Настройки Архивации"
@@ -10571,7 +10529,7 @@ msgstr "Недопустимое имя списка"
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для нового списка доступа."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Пригласить участников"
@@ -10598,7 +10556,7 @@ msgstr "_Закончить"
 msgid "Commands"
 msgstr "Команды"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10669,119 +10627,133 @@ msgstr "Запрос на подписку от %s"
 msgid "Loading"
 msgstr "Загрузка"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Подключен"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Удаление учетной записи..."
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Щелкните для изменения пароля"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Соединяюсь"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Сервер не поддерживает Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Символ недопустим"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Сервер не поддерживает Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Соединение разорвалось"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "Добавить контакт..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Создать новое сообщение"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "В качестве номера порта должно выступать число"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "Имя ресурса должно быть от 1 до 1023 символов"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Дополнительные действия"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Безопасность"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Неизвестная ошибка SSL '%s'"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Удаление учетной записи"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Зарегистрировать %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Учетная запись"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Учётные записи"
@@ -10824,246 +10796,250 @@ msgstr "Поиск"
 msgid "No results found"
 msgstr "Нет результата"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "По умолчанию"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "заголовок сообщения о статусе"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "текст сообщения о статусе"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Авторизация"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Переподключиться сейчас?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Если вы хотите, чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 #, fuzzy
 msgid "_Re-Login"
 msgstr "Авторизация"
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Неверное имя учетной записи"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr "Все окна чатов и комнат будут закрыты."
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Неверное имя учетной записи"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 #, fuzzy
 msgid "Label"
 msgstr "статусное сообщение"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr "Авторизация"
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 msgid "Import Contacts"
 msgstr "Импорт Контактов"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-msgid "Client Certificate"
-msgstr "Сертификат Владельца"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Соединяться при запуске Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 msgid "Save conversations for all contacts"
 msgstr "Сохранять историю для всех контактов"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr "Сохранять переписку на жестком диске"
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 msgid "Global Status"
 msgstr "Глобальный статус"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Изменяет статус учетной записи или записей"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Использовать прокси для передачи файла"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Бездействует с:"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Сертификат Владельца"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Разрешить Gajim отправлять информацию о операционной системе, которую вы "
 "используете"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Пригласить участников"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr "Ручной ввод имени сервера"
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Приори_тет:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 msgid "Use environment variable"
 msgstr "Использовать переменную среды"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Изменяет статус учетной записи или записей"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Имя:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Фамилия:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Новое письмо"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "В _зависимости от статуса"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Включить"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Соединение"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+msgid "Client Certificate"
+msgstr "Сертификат Владельца"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "Файлы PKCS12"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 msgid "Encrypted Certificate"
 msgstr "Шифрованный Сертификат"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Сертификат владельца"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Сохранить пароль"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Модули"
@@ -11116,19 +11092,19 @@ msgstr[0] "Удален %d контакт"
 msgstr[1] "Удалено %d контактов"
 msgstr[2] ""
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Неизвестный исполнитель"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Неизвестная песня"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Неизвестный альбом"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11142,20 +11118,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Закладки"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Архив поврежден"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "Архив пуст"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "Формат архива не поддерживается"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Модуль уже существует"
@@ -11210,127 +11186,288 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Показать непросмотренные _события"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Возможности"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Проверка орфографии набираемых сообщений"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Обзор сервисов включая ноды, поиск пользователей"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Контакты"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Комнаты"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Недавно:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Ошибка в модуле"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Возобновлённая беседа"
+
+#~ msgid "Simulate loss of connectivity"
+#~ msgstr "Имитировать потерю связи"
+
+#~ msgid "Simulate regaining connectivity"
+#~ msgstr "Имитировать восстановление подключения"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Неизвестная ошибка SSL: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim — %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires: libsecret and a provider (such as GNOME Keyring and "
+#~ "KSecretService)"
+#~ msgstr ""
+#~ "Требует libsecret и какой-либо менеджер ключей(GNOME Keyring или "
+#~ "KSecretService)."
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Выберите интервал между 2 проверками на бездействие."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Нет словаря для языка %s"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Чтобы воспользоваться проверкой правописания, установите словарь для "
+#~ "языка \"%s\" или выберите другой язык, исправив настройку "
+#~ "speller_language.\n"
+#~ "\n"
+#~ "Слова с ошибками подсвечиваться не будут"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Переподсоединиться"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Выйти"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Показать только активных"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "Добавить контакт..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Пригласить участников"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Покинуть конференции"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Новая комната"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Если активно, то Gajim отображает иконку на каждой вкладке, которая "
+#~ "содержит непрочитанные сообщения. В зависимости от темы, она может быть "
+#~ "анимированной."
+
+#~ msgid "Show a mini avatar in chat window tabs and as the window's icon."
+#~ msgstr ""
+#~ "Показывать мини-аватар на вкладках окна чата и в качестве значка окна."
+
+#~ msgid "Show _avatar in chat tabs"
+#~ msgstr "Показать _аватар в вкладках чата"
+
+#~ msgid "If checked, the contact's avatar will be shown in chat tabs"
+#~ msgstr ""
+#~ "Если этот флажок установлен, аватар контакта будет отображаться во "
+#~ "вкладках чата"
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Имя сервера должно быть от 1 до 1023 символов"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Неверный символ в имени сервера"
+
+#~ msgid "Server address required."
+#~ msgstr "Требуется адрес сервера."
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Имя должно быть от 1 до 1023 символов"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Неверный символ в имени пользователя."
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "Имя ресурса должно быть от 1 до 1023 символов"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Неверный символ в ресурсе"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Уведомлять о контактах, которые _вошли"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Уведомлять о контактах, которые _вышли: "
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Показывать _уведомления при получении сообщений"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Уведомить меня, когда передача файлов закончится"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Уведомить меня, когда передача файлов закончится"
+
+#~ msgid "Notification color for stopped or completed file transfers."
+#~ msgstr "Цвет уведомления для остановленных или завершенных передач файлов."
+
+#~ msgid "Notification color for group chat invitations."
+#~ msgstr "Цвет уведомления для приглашений группового чата."
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Фоновый цвет контакта, который только что вошел."
+
+#~ msgid "Notification color for other dialogs."
+#~ msgstr "Цвет уведомления для других диалоговых окон."
+
+#~ msgid "Event Type"
+#~ msgstr "Тип события"
+
+#~ msgid "Event desc"
+#~ msgstr "Описание события"
+
+#~ msgid "HTTP File Upload: Enable HTTPS Verification."
+#~ msgstr "Загрузка файлов HTTP: включить проверку HTTPS."
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Вы не подключены к серверу"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Такое имя уже есть"
 
@@ -12005,9 +12142,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Отправить личное сообщение"
 
-#~ msgid "Send _File"
-#~ msgstr "Отправить _файл"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Участники"
@@ -14794,9 +14928,6 @@ msgstr "Ошибка в модуле"
 #~ "не устраивает, вы можете выбрать другой.\n"
 #~ "Также, возможно, придется изменить некоторые настройки брандмауэра."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Объединить учетные записи"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "Невозможно использовать OpenPGP на этом компьютере"
 
@@ -15376,9 +15507,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Требует python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Требует gnome-keyring и python-gnome2-desktop или kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/sk.po b/po/sk.po
index 6b3a3b36c..d62055f21 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2010-02-28 20:43+0100\n"
 "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,75 +18,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Účty"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "a overený"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "a NEoverený"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Vybrať obrázok"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Chystáte sa zavrieť niekoľko kariet"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Súkromný zoznam"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Zakazujem %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "Ak pošlete súbor %s, on/ona budú poznať vaše skutočné Jabber ID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Pokračovať"
 
@@ -151,230 +157,222 @@ msgstr "Nie sú tu žiadne čakajúce požiadavky o zapísanie."
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Zobraziť _odhlásené kontakty"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Poslať krátku _správu"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Vykonať príkaz"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "S_pravovať transport"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Premenovať"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Odblokovať"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokovať"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "O_dstrániť"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informácie"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Poslať _súbor"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Uložiť súbor ako..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Uložiť súbor ako..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Posledný stav: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Pozvať _kontakty"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Pridať kontakt..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Požiadavka na hlasový rozhovor"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Video test"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Informácie"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_História"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Píše správu"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Všetky stavy"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Pozvať _kontakty"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Opustiť diskusnú skupinu"
+msgid "Rename…"
+msgstr "_Premenovať"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Zmeniť _predmet..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Opustiť diskusnú skupinu"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Vybrať obrázok"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Nová diskusná skupina"
+msgid "Configure…"
+msgstr "_Nastavovať"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Ničí sa %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registrácia zlyhala"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Prednastavené správy:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Minimalizovať pri zavretí"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Minimalizovať pri automatickom pripojení"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Zmeniť p_rezývku..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hlas"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Vykonať príkaz"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -382,272 +380,275 @@ msgstr[0] "Pred %i dňami"
 msgstr[1] "Pred %i dňami"
 msgstr[2] "Pred %i dňami"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Píše správu"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Všetky stavy"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Pridať kontakt..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "súbor"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Poslať krátku _správu"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Preskúmať služby"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Predvoľby"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Čierna listina"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Zálož_ky"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Konfigurácia miestnosti"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Synchronizovať"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Poslať serverovú správu..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Nastaviť správu dňa..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Aktualizovať správu dňa..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Odstrániť správu dňa"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Pridať kontakt..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Upraviť účet"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Upraviť účet"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Účty"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopírovať JID/e-mailovú adresu"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Pridať kontakt..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopírovať umiestnenie odkazu"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otvoriť odkaz v prehliadači"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopírovať JID/e-mailovú adresu"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otvoriť tvorbu E-mailu"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopírovať umiestnenie odkazu"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Umiestnenie:"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopírovať JID/e-mailovú adresu"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Poz_vať"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Odblokovať"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Blokovať"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Vykopnúť"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Zakázať"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Vlastník"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Člen"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Člen"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Hlas"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "JID miestnosti"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "Správa:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Emotikony:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Nie je možné nájsť databázu so záznamami o histórii"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Súbor neexistuje"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM adresa:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dátum"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -655,29 +656,29 @@ msgstr "Dátum"
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Správa"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Predmet"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Chyba databázy"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "vytváranie záznamov databáz"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -690,28 +691,28 @@ msgstr ""
 "\n"
 "V prípade, že zvolite Áno, prosíme o strpenie..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Vyč_istiť"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Vy"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o %(time)s povedal: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -719,7 +720,7 @@ msgstr[0] "Zrušiť potvrdenie"
 msgstr[1] "Zrušiť potvrdenie"
 msgstr[2] "Zrušiť potvrdenie"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -727,7 +728,7 @@ msgstr[0] "Skutočne si želáte zmazať vybraných správ?"
 msgstr[1] "Skutočne si želáte zmazať vybraných správ?"
 msgstr[2] "Skutočne si želáte zmazať vybraných správ?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -735,7 +736,7 @@ msgstr[0] "Predvolená správa"
 msgstr[1] "Predvolená správa"
 msgstr[2] "Predvolená správa"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -743,232 +744,237 @@ msgstr[0] "Skutočne si želáte zmazať vybraných správ?"
 msgstr[1] "Skutočne si želáte zmazať vybranú správu?"
 msgstr[2] "Skutočne si želáte zmazať vybrané správy?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktné meno: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Všeobecné"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Skupina"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "V skupine"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Nastaviť náladu"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Žiadny"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s správa o stave"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Prepísať správu o stave?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Tento názov je už použitý. Chcete prepísať túto správu o stave?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Správa o stave"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Uložiť ako prednastavené..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Má"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Stav"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Meno"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Tento účet nie je pripojený k serveru"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemôžete sa synchronizovať s kontaktom ak nie je prihlásený."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "zvuk a video"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "zvuk"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "video"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Poslať _súbor"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Uložiť súbor ako..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Prenos súborov"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Nesprávny súbor"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Vykopnúť %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Čierna listina"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Požiadavka na hlasový rozhovor"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s má nastavený predmet na %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Miestnosť práve zobrazuje nedostupného člena"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "Miestnosť práve zobrazuje nedostupného člena"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Relácia NEBUDE zaznamenaná"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informácie o vás sú uložené na serveri"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Miestnosť je teraz neanonymná"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Miestnosť je teraz poloanonymná"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Miestnosť je teraz anonymná"
@@ -983,7 +989,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Chyba."
 
@@ -1011,22 +1017,22 @@ msgstr "Bola vytvorená nová miestnosť"
 msgid "Failed to Configure Group Chat"
 msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s je známy ako %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Teraz ste známy ako %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s je teraz %(status)s"
@@ -1152,82 +1158,82 @@ msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "Ak zatvoríte okno, budete odpojený z tejto diskusnej skupiny."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Tento kontakt nepodporuje prenos súborov."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskusnej skupiny %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Práve ste prijali novú správu od \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Poslať a zatvoriť"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nová správa"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Poslať a zatvoriť"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1236,187 +1242,178 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s je teraz %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Prenos súborov"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Veľkosť: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Prijať"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Odhlásený"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otvoriť priečinok s obsahom"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Vzdialený kontakt zastavil prenos"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Chyba otvárania súboru"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Prenos súboru bol zastavený"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Prenos súboru bol zrušený"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Spojenie s druhou stranou nie je možné nadviazať."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Zobraziť udalosť v zozname"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor rozšírenej konfigurácie"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s konfiguračná chyba"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Začať rozhovor"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Diskuné skupiny"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho alebo jej stav."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizácia bola odstránená"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
@@ -1426,7 +1423,7 @@ msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
 msgid "desynced"
 msgstr "Pokročilé"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1446,7 +1443,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Vždy zavrieť Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Koniec"
@@ -1597,8 +1595,8 @@ msgstr "Premenovať skupinu"
 msgid "Please enter a new name"
 msgstr "Vytvorte, prosím, čisto novú tému z vami požadovaným názvom."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Preme_novať"
@@ -1618,27 +1616,32 @@ msgid "_Also remove all contacts of this group from contact list"
 msgstr ""
 "Tiež odstráni všetky kontakty v tejto skupine z vášho zoznamu kontaktov"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Opustiť diskusnú skupinu"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Premenovať kontakt"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Chcete skutočne odstrániť skupinu %s zo zoznamu kontaktov?"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1648,21 +1651,21 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1674,25 +1677,25 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Premenovať kontakt"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1701,35 +1704,35 @@ msgstr ""
 "Váš server nepodporuje ukladanie informácií metakontaktov. Tak tieto "
 "informácie nebudú uložené pri ďalšom prihlásení."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Premenovať kontakt"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Tvorivý"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1737,100 +1740,101 @@ msgstr[0] "Chcete poslať tieto súbory účtu %s:"
 msgstr[1] "Chcete poslať tento súbor účtu %s:"
 msgstr[2] "Chcete poslať tieto súbory účtu %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Poslať"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Poslať %s do %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Poslať súbor kontaktu"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Poslať súbor kontaktu"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Publikovať umiestnenie"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Poslať sprá_vu skupine"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Poz_vať do"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Upraviť _skupiny"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "O_dstrániť"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Preme_novať"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "Znovu p_ripojiť"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "_Vykonať príkaz"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_História"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Pozorovatelia"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1959,71 +1963,71 @@ msgstr "Súkromné rozhovory"
 msgid "Messages"
 msgstr "Správy"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Overenie HTTP (%(method)s) pre %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Prijať túto požiadavku?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Prijať túto požiadavku?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Autorizácia bola odoslaná"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Autorizácia bola odoslaná"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Žiadny"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Požiadavka o zapísanie"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr ""
 "Kontakt \"%s\" vás autorizoval, aby ste mohol vidieť jeho alebo jej stav."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Požiadavka o zapísanie"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2032,149 +2036,149 @@ msgstr ""
 "Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
 "Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Nezapísaný"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikát vypršal"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Vzdialený kontakt zastavil prenos"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Chyba otvárania súboru"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prenos súborov"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce začať hlasový rozhovor."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Požiadavka na hlasový rozhovor"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Nezabezpečené spojenie"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2184,20 +2188,20 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
 "tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Pripájanie"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2402,11 +2406,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2737,28 +2741,23 @@ msgstr ""
 "Argument \"%(arg)s\" nie je špecifikovaný. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je priečinok ale mal byť súbor"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "jem"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Neznáma chyba SSL: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nová súkromná správa"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2766,50 +2765,50 @@ msgstr[0] "Správa od %(nickname)s"
 msgstr[1] "Správa od %(nickname)s"
 msgstr[2] "Správa od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Nová diskusná skupina"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmenil stav"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je teraz %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakt zmenil stav"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s sa prihlásil"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s sa odhlásil"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Overenie zlyhalo s \"%s\""
@@ -2876,64 +2875,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Predbežné zobrazenie nových správ vo vyskakovacom oznámení?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Upozorniť ma, keď sa dokončí prenos"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Upozorniť ma, keď sa dokončí prenos"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Farba pozadia použitá pri prihlásení kontaktu."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Zoznam (oddelený medzerami) a riadkov (účet a skupina), ktoré sú zabalené."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "predvolená"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Jazyk pre kontrolu pravopisu"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2943,15 +2900,15 @@ msgstr ""
 "'sometimes' - zobraziť každých print_ichat_every_foo_minutes minút.\n"
 "'never' - nezobrazovať čas."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Použiť * / _ pár znakov ako možné formátovacie znaky."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2960,7 +2917,7 @@ msgstr ""
 "Ak je pravda, neodstaňuj */_ .  Takže *abc* bude tečné a * * nebude "
 "odstránené."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2969,7 +2926,7 @@ msgstr ""
 "Znak použitý za prezývkou, keď sa používa automatické dopĺňanie (tab) v "
 "diskusnej skupine."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2978,17 +2935,17 @@ msgstr ""
 "Vaša prezývka sa zhoduje s inou prezývkou v diskusnej miestnosti aj po "
 "pripojení znaku."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -2996,24 +2953,24 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Znaky zobrazené za prezývkou v konverzáciách"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Znaky zobrazené pred prezývkou v konverzáciách"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so zoznamom "
 "kontaktovi."
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3022,30 +2979,30 @@ msgstr ""
 "Koľko riadkov si pamätať z predchádzajúceho rozhovoru, keď bude karta/okno "
 "znovu otvorená."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Poslať správu pri stlačení Ctrl+Enter a pri Enter spraviť nový riadok "
 "(chovanie podobné ako Mirabilis ICQ klient)"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Koľko riadkov posunúť pri stlačení Ctrl+KP_hore."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3054,12 +3011,12 @@ msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ak je zaškrtnuté, Gajim môže byť ovládaný na diaľku s použitím gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3068,59 +3025,59 @@ msgstr ""
 "Pokiaľ sa čas pri každej správe (print_time==sometimes), vypíše sa každých x "
 "minút."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre diskusnú skupinu."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
 msgstr ""
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamená KiB = 1024 bajtov, KB = 1000 bajtov."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Upozorňovať na udalosti v oblasti systémových upozornení."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať kartu len ak prebieha konverzácia?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v karte?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Predbežné zobrazenie nových správ vo vyskakovacom oznámení?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
 msgstr "Bodkočiarkou oddelený zoznam slov bude zvýraznený v diskusnej skupine."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3130,22 +3087,13 @@ msgstr ""
 "Ak je pravda, Gajim skončí keď bude X tlačidlo vo Window manažéri stlačené. "
 "Toto nastavenie je použíté, len v prípade, že sa používa trayikona."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej neprečítané "
-"správy. Závisí na téme, ikonka môže byť animovaná."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3154,12 +3102,12 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí stavovú správu v zozname kontaktov, za "
 "predpokladu, že táto správa nie je prázdna."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3168,26 +3116,26 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť informáciu o zmene stavu kontaktu a jeho/"
 "jej stavovú správu"
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Nezobrazovať zoznam v paneli úloh."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3197,7 +3145,7 @@ msgstr ""
 "2.8, potom bude okno blikať (bežné správanie pre väčšinu okenných "
 "manažérov), keď sa udeje nejaká udalosť."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3218,7 +3166,7 @@ msgstr ""
 "'pertype' - Každý typ správy (napr., rozhovory proti diskusiám) sú odoslané "
 "do špecifikovaného okna."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3226,32 +3174,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Ak nie je pravda, neuvidíte avatarov v diskusnom okne"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Ak je pravda, stlačením Esc klávesy zatvoríte kartu/okno."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Skrývanie titulku v okne s diskusnou skupinou"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Skrývanie titulku v okne s diskusnou skupinou"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Skrývanie zoznamu účastníkov v okne s diskusnou skupinou."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3260,11 +3208,11 @@ msgstr ""
 "V rozhovore sa zobrazí prezývka na začiatku riadku, len v prípade, že "
 "predchádzajúca správa prišla od inej osoby."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3273,7 +3221,7 @@ msgstr ""
 "Ctrl-Tab vás presunie na ďalšiu kartu, pokiaľ už nie sú žiadne neprečítané "
 "správy."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3282,7 +3230,7 @@ msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3291,7 +3239,7 @@ msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3302,7 +3250,7 @@ msgstr ""
 "účtov. BUĎTE OPATRNÝ, keď sa prihlásite s zápornou prioritou, tak nebudete "
 "dostávať ŽIADNE správy z vášho servera."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3311,7 +3259,7 @@ msgstr ""
 "Ak je pravda, Gajim bude zobrazovať počet prítomných a všetkých kontaktov v "
 "riadku účtu a skupiny."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3320,11 +3268,11 @@ msgstr ""
 "Ak je pravda, Gajim naroluje a označí kontakt, ktorý poslal poslednú správu, "
 "ak nie je práve otvorené okno rozhovoru."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Doba neaktivity potrebná na zmenenie stavu na zatvoril okno."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3332,66 +3280,62 @@ msgstr ""
 "Maximálny počet riadkov zobrazených v rozhovore. Najstaršie riadky budú "
 "zmazané."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3400,11 +3344,7 @@ msgstr ""
 "Ak je povolené, Gajim sa nebude pýtať na správu o stave. Namiesto nej bude "
 "použitá predvolená špecifikovaná správa."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3412,37 +3352,37 @@ msgstr ""
 "Ak je pravda, Gajim bude používať Správca zväzku kľúčov (ak je prítomný) na "
 "ukladanie hesiel."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3451,7 +3391,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3460,7 +3400,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3469,7 +3409,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3478,7 +3418,7 @@ msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3487,28 +3427,32 @@ msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Zazáložkovať túto miestnosť"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3517,64 +3461,64 @@ msgstr ""
 "Priorita sa zmení automaticky vzhľadom k vášmu stavu. Priority sú definované "
 "v premenných autopriority_* nastaveniach."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Ak je povolené, obnoví sa naposledy použitý stav."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "Ak nie je pravda, neuvidíte avatarov v diskusnom okne"
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3583,20 +3527,20 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim použije vašu IP adresu a proxy definovanú v "
 "premennej file_transfer_proxies na prenos súborov."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Ak je povolené, Gajim sa nebude pýtať na správu o stave. Namiesto nej bude "
 "použitá predvolená špecifikovaná správa."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3604,17 +3548,17 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vám chce poslať súbor."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3623,28 +3567,24 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim použije vašu IP adresu a proxy definovanú v "
 "premennej file_transfer_proxies na prenos súborov."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3653,41 +3593,41 @@ msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Povoliť šifrovanie ESessions pre tento účet."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3696,1150 +3636,1150 @@ msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Spím"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Pracujem."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Pracujem"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefonujem"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Telefonujem."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Vonku"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Som vonku a užívam si život."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Prítomný."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Nie som prítomný."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Nerušiť."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Ahoj!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "'muc_highlight_words' or your nickname is mentioned."
 msgstr ""
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Pre"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Diskuné skupiny"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Diskusná skupina"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Diskuné skupiny"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Vytváranie diskusných skupín je obmedzené."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Nová diskusná skupina"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Služba nebola nájdená"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Toto nie je diskusná skupina"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Účet Local už existuje."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Diskusná skupina %s neexistuje."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Diskuné skupiny"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Domáce práce"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Kupujem potraviny"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Upratujem"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Varím"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Robím údržbu"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Umývam riad"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Periem"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Záhradničím"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Na obchôdzke"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Venčím psa"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Pijem"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Pijem pivo"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Pijem kávu"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Pijem čaj"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Desiatujem"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Raňajkujem"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Večeriam"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Obedujem"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Bicyklujem"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Tancujem"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Som na túre"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Klusám"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Športujem"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Behám"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Lyžujem"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Plávam"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Posilňujem"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Starám sa o seba"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "V kúpeloch"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "V kaderníctve"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Holím sa"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Kúpem sa"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Sprchujem sa"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Na schôdzke"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Neaktívny"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Koniec dňa"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Som vonku"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Hrám skrývačku"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Na dovolenke"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Modlím sa"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolenka"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Rozmýšľam"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Oddychujem"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Som na rybách"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Hrám sa"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Som vonku"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Žúrujem"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Čítam"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Nacvičujem"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Nakupujem"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Fajčím"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Mám spoločnosť"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Opalujem sa"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Sledujem TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Sledujem film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Rozprávam"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "Bezprostredne"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Telefonujem"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Cestujem"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Prichádzam"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Šoférujem"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "V aute"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "V lietadle"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Vo vlaku"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Na výlete"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Prechádzam sa"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Kódim"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "Na stretnutí"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Študujem"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Píšem"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Vystrašený"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Prekvapený"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Zamilovaný"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Nahnevaný"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Vyburcovaný"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Znudený"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Statočný"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Pokojný"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Opatrný"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Podchladený"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Sebaistý"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Zmätený"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Hĺbavý"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Spokojný"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Rozhádzaný"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Bláznivý"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Tvorivý"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Zvedavý"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Deprimovaný"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Skľúčený"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Sklamaný"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Zhnusený"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Zhrozený"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Zmätený"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Zavistlivý"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Vzrušený"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Koketný"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustrovaný"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Príjemný"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Trúchliaci"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Podráždený"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Previnilý"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Šťastný"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Nádejný"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Prehriaty"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Ponížený"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Porazený"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Hladný"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Zranený"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Rešpektovaný"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Zaľúbený"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Rozhorčený"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Zainteresovaný"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Opitý"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Nepremožiteľný"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Žiarlivý"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Osamelý"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Stratený"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Šťastný"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Protivný"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Náladový"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervózny"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutrálny"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Urazený"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Pobúrený"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Hravý"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Hrdý"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Odpočinutý"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Odľahčený"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Kajajúci"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Neposedný"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Smutný"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Uštipačný"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Spokojný"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Vážny"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Hanblivý"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Na vracanie"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Ospanlivý"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontánny"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Vystresovaný"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Silný"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Prekvapený"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Vďačný"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Smädný"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Unavený"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Neurčitý"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Slabý"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Ustarostený"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "predvolená"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "námornícka"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Hrám skrývačku"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Účet"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Účet"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Popis"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Chyba"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "jeden"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "miestnosť"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Nepodarilo sa získať problematický certfikát"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Nepodarilo sa získať certifikát CRL"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodarilo sa dešifrovať podpis certifikátu"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodarilo sa dešifrovať CRL podpis"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Podpísanie certifikátu zlyhalo"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Zlyhanie CRL podpisu"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Certifikát vypršal"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL vypršal"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodarilo sa získať lokálny problematický certifikát"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Nepodarilo sa overiť prvý certifikát"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Reťazec certifikátu je príliš dlhý"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certifikát nie je dôverný"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certifikát odmietnutý"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Zlyhalo overenie aplikácie"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certifikát vypršal"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Neznáma chyba SSL: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Certifikát vypršal"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Premenovať kontakt"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Emotikony zakázané"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Certifikát vypršal"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "E2E šifrovanie povolené"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Rozšírenie nie je podporované"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4901,12 +4841,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s konfiguračná chyba"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4918,222 +4858,192 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "zvukový vstup"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "zvukový výstup"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "video vstup"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Nepovolený znak v názve hostiteľa."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Adresa serveru je požadovaná."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Nepovolený znak v názve účtu."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Nepovolený znak v zdroji."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Neprítomný"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "P_reč"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Preč"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Žiadny"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Pre"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Oba"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Neznámy"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Účastníci"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Účastník"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Vlastník"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Vlastník"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrátor"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Člen"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Člen"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "píše správu..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5141,22 +5051,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "v _diskusných skupiných"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od používateľa %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5164,50 +5074,39 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Vypršal čas nahrávania obrázku"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Obrázok je príliš veľký"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "GPG je nepoužitelný"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Vypršal čas nahrávania obrázku"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je súbor ale mal byť priečinok"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim bude ukončený"
 
@@ -5312,83 +5211,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Súbor je prázdny"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Súbor neexistuje"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E šifrovanie zakázané"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Zmeniť informáciu o stave"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Zmeniť stav"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Mám čas na debatu"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Prítomný"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Nerušiť"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Odhlásený - odpojený"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Stav bol zmenený."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Poslať kontakt: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Poslať kontakty:"
 
@@ -5411,7 +5310,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Účet"
 
@@ -5422,7 +5321,7 @@ msgstr "Diskuné skupiny"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Heslo:"
@@ -5446,7 +5345,7 @@ msgstr "v _diskusných skupiných"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Pripojiť"
@@ -5464,17 +5363,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
@@ -5622,7 +5521,7 @@ msgstr "Kontaktné informácie"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Popis"
 
@@ -5827,39 +5726,44 @@ msgstr "Práca"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "O mne"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Pripojiť sa k diskusnej skupine"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Hneď som späť"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Pripojiť"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Odstraňuje sa účet %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5928,6 +5832,7 @@ msgid "Strike"
 msgstr "Preškrtnuté"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Farba"
 
@@ -5940,136 +5845,131 @@ msgstr "Písmo"
 msgid "Clear formatting"
 msgstr "Vymazať formátovanie"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Vyberte súbor na odoslanie..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Zakazujem..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Zmeniť p_rezývku..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Zmeniť _predmet..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Vložte nové heslo:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Ak je zaškrtnuté, Gajim sa pripojí do diskusnej skupiny pri štarte"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Vyskytla sa chyba:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Overiť znovu..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Účastník"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Vykopnúť"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Účastník"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Zakázať"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Nová diskusná skupina"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Ničí sa %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Dôvod"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Zadať nové meno skupiny %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Poz_vať"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Udalosť"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Udalosť"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6167,20 +6067,20 @@ msgid "Add"
 msgstr "Pridať"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "O_dstrániť"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Zdroj:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Stav"
 
@@ -6190,7 +6090,7 @@ msgid "Client"
 msgstr "<b>Klient:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Systém:</b>"
@@ -6335,38 +6235,39 @@ msgstr "_Správanie okna:"
 msgid "_Show contact list on startup"
 msgstr "Zobraziť _zoznam"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Z_lúčiť účty"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Zobraziť a_vatary v zozname kontaktov"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6375,12 +6276,12 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname kontaktov a v "
 "oknách s diskusnými skupinami."
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6389,53 +6290,53 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
 "zozname kontaktov a v oknách s diskusnými skupinami"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Zobraziť _pozíciu kontaktov v zozname"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Usporiadať kontakty podľa stavu"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Poslať kontakty:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "v _diskusných skupiných"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Kontakt odpojený"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Kontrola pravopisu"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6448,29 +6349,29 @@ msgstr ""
 "pravým na vstupné pole, predvolený jazyk bude použitý pre tento kontakt "
 "alebo diskusnú skupinu."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "obsah správy"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6479,58 +6380,58 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť informáciu o zmene stavu kontaktu a jeho/"
 "jej stavovú správu"
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Registrácia zlyhala"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Zobraziť zatváracie tlačidlo v karte?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6539,116 +6440,119 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Zobraziť zatváracie tlačidlo v karte?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
+"používate"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Posledný stav: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Rozhovory"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Notification-daemon"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Keď nastane nová udalosť:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Povoliť vyskakovacie okná/oznámenia v stavoch _preč/nedostupný/zamestnaný/"
 "neviditeľný"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Povoliť vyskakovacie okná/oznámenia v stavoch _preč/nedostupný/zamestnaný/"
 "neviditeľný"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Vizuálne oznámenie</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "_Spravovať..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Povoliť zvuk keď som zane_prázdnený"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav zvuky"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Oznámenia"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Neprítomný"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6657,7 +6561,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim zmení stav na Neprítomný, keď nebude dlhšie "
 "používaný počítač."
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6666,7 +6570,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim zmení stav na Neprítomný, keď nebude dlhšie "
 "používaný počítač."
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6677,7 +6581,7 @@ msgstr ""
 "Automatická správa pre stav preč. Ak je prázdna, Gajim nebude meniť súčasnú "
 "stavovú správu o stave"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6688,40 +6592,40 @@ msgstr ""
 "Automatická správa pre stav neprítomný. Ak je prázdna, Gajim nebude meniť "
 "súčasnú správu o stave"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minút"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatický stav"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Vyžiadať správu o stave, keď som:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Prihlás_il sa"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Odhlásil sa"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6729,68 +6633,68 @@ msgstr ""
 "Ak je povolené, Gajim sa nebude pýtať na správu o stave. Namiesto nej bude "
 "použitá predvolená špecifikovaná správa."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Predvolená správa"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Povolené"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Správa o stave"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Vrátiť pôvodnú správu o stave</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Téma"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Téma"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Nastavovať farbu a písmo rozhrania"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Zostava stavových _ikôn:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Použiť ikony _transportov"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6800,124 +6704,134 @@ msgstr ""
 "kontakt z MSN bude mať ekvivalentné ikonky pre stavy prítomný, preč, "
 "zaneprázdnený, atď...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Štýl"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Funkcie"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Výstupné zariadenie zvuku"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Vstupné zariadenie zvuku"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Zvukový test"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Video test"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Vstupné zariadenie videa"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "video výstup"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Video test"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Video test"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Spojenie"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "STUN server:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Zvuk / Video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Spravovať..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Ak je zaškrtnuté, Gajim si zapamätá heslo pre tento účet"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Rôzne</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Editor rozšírenej konfigurácie"
@@ -7101,12 +7015,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Vložte nové heslo:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Pokročilé akcie"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Použiť vlastný názov hostiteľa/portu"
@@ -7192,7 +7106,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Prihlás_il sa"
@@ -7206,7 +7120,7 @@ msgstr "Vytvorte, prosím, čisto novú tému z vami požadovaným názvom."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7234,8 +7148,8 @@ msgstr "Náv_rat k pôvodnému nastaveniu farieb"
 msgid "Resets value to default"
 msgstr "Náv_rat k pôvodnému nastaveniu farieb"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Názov _hostiteľa:"
@@ -7279,7 +7193,7 @@ msgstr "Certifikát podpísaný sám sebou"
 msgid "Proxy Host"
 msgstr "_Hostiteľ proxy:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Typ"
 
@@ -7293,8 +7207,7 @@ msgstr "_Protokol:"
 msgid "Copy info to clipboard"
 msgstr "_Kopírovať umiestnenie odkazu"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Funkcie"
 
@@ -7480,6 +7393,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Zmeniť správu o stave"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Nálada:</b>"
@@ -7554,8 +7472,8 @@ msgstr ""
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7745,80 +7663,106 @@ msgstr "Registrácia zlyhala"
 msgid "_Name"
 msgstr "_Názov:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Začať rozhovor"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Správca histórie"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Registrácia zlyhala"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Predvoľby"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Koniec"
+msgid "_Accounts"
+msgstr "Účty"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Zobraziť"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Zobraziť len _aktívne kontakty"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Zobraziť _odhlásené kontakty"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Zobraziť len _aktívne kontakty"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Zobraziť trans_porty"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML konzola"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Prenos súborov"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Pomocník"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Prítomný"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Prítomný"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Funkcie"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "O mne"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7833,6 +7777,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Opustiť diskusnú skupinu"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8116,60 +8065,68 @@ msgstr "Kontakt odpojený"
 msgid "Create new group chat"
 msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Predvoľby"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Prenos súborov"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "správa o stave"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Zobraziť _XML konzolu"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Vzhľad rozhovoru</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Zobraziť _odhlásené kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Zobraziť len _aktívne kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Zobraziť len _aktívne kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Kontaktné informácie"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Premenovať kontakt"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Poslať kontakty:"
@@ -8246,12 +8203,16 @@ msgstr "Vyplňte formulár."
 msgid "Group Chat Configuration"
 msgstr "Pozvánka do diskusnej skupiny"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML konzola"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Začať rozhovor..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
@@ -8297,11 +8258,6 @@ msgstr "Zobraziť všetky čakajúce _udalosti"
 msgid "Mute Sounds"
 msgstr "Stlmiť zvuky"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Predvoľby"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8623,124 +8579,124 @@ msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Diskuné skupiny"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Diskuné skupiny"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Diskusná skupina nemá nastavený predmet"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Diskuné skupiny"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Diskuné skupiny"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Diskuné skupiny"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Relácia NEBUDE zaznamenaná"
@@ -8769,7 +8725,7 @@ msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Príjemca: "
 
@@ -8922,7 +8878,7 @@ msgstr "Súbor:"
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
@@ -8937,7 +8893,7 @@ msgid "Change"
 msgstr "Zmeniť p_rezývku..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Hneď som späť"
@@ -8968,11 +8924,12 @@ msgid "Password Change Failed"
 msgstr "Heslo je požadované"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Vyskytla sa chyba počas tvorby účtu"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
@@ -9012,40 +8969,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Neznáma chyba SSL: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Pokračovanie rozhovoru"
+msgid "Start / Join Chat"
+msgstr "Začať rozhovor"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Pridať kontakt..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s nenájdený"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9054,33 +9006,33 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Ostatný"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Diskuné skupiny"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehliadať dostupné služby"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehliadanie služieb s použitím účtu %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Prehliadanie služieb"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9088,142 +9040,142 @@ msgstr ""
 "Žiadna služba nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žiadne položky na prehľadávanie."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Neplatný názov servera"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prehliadanie %(address)s s použitím účtu %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Prehliadať"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky na prehliadanie."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "príkaz"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Hľadať"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Prieskúmava sa %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Používatelia"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Prihlásiť"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nová správa"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Poslať krátku správu"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "predmet"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Krátka správa s použitím účtu %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Krátka správa v účte %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Krátku správu"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Znak nie je povolený"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
@@ -9269,92 +9221,75 @@ msgstr "Registrácia úspešná"
 msgid "Registration failed"
 msgstr "Registrácia zlyhala"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Slovník pre jazyk %s nie je k dispozícii"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Potrebujete nainštalovať %s slovník, aby bolo možné prevádzať kontrolu "
-"pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
-"nastavením premennej setting the speller_language."
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "pre účet %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG číslo:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
@@ -9369,6 +9304,11 @@ msgstr "GG číslo:"
 msgid "ICQ Number"
 msgstr "ICQ číslo:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Pridať kontakt..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9424,7 +9364,7 @@ msgstr "Chyba pri pridávaní služby. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9586,43 +9526,63 @@ msgstr "Kontakt odpojený"
 msgid "Contact Connected Background "
 msgstr "Kontakt pripojený"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Správa o stave"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Správa o stave"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Správa o stave"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Správa o stave"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Neplatná prezývka"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Znak nie je povolený"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Skutočne si želáte zmazať vybraných správ?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Tento názov je už použitý. Chcete prepísať túto správu o stave?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktívne"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Registrácia zlyhala"
@@ -9646,10 +9606,9 @@ msgid "Error: %s"
 msgstr "Chyba: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Chyba"
 
@@ -9663,48 +9622,48 @@ msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Nový e-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Upratujem"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Spravovať Proxy profily"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Upraviť stav"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Odhlásený"
@@ -9725,7 +9684,7 @@ msgstr "Účet"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Váš nový účet bol úspešne vytvorený"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9757,60 +9716,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Synchronizovať"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Čo si prajete vykonať?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Pripájanie"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Preposlať neprečítané správy"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber klient"
@@ -9869,127 +9833,127 @@ msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Pavol Klačanský <pavol@klacansky.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Vyberte súbor na odoslanie..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Vybrať obrázok"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Všetky súbory"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Všetky súbory"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Poslať _súbor"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Obrázky"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vybrať obrázok"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Všetky súbory"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Uložiť súbor ako..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tejto diskusnej skupiny"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Pripojený"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Odpojený"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Názov súboru: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Stiahnuť"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Nahrať"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Prenos súboru bol zastavený"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Popis:"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?stav prenosu:Pozastavené"
@@ -9998,7 +9962,7 @@ msgstr "?stav prenosu:Pozastavené"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Nesprávny súbor"
@@ -10054,26 +10018,26 @@ msgstr "Zvýraznenie správ v diskusnej skupine"
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Heslo je požadované"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Žiadny"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Zrušiť"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10092,11 +10056,6 @@ msgstr "použiť účet %s"
 msgid "Hide _Contact List"
 msgstr "Pozvať _kontakty"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Zobraziť len _aktívne kontakty"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
@@ -10146,36 +10105,31 @@ msgstr ""
 "Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
 "neskôr."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Predvoľby"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Predvoľby"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Nie ste pripojený k serveru"
+msgid "Archiving Preferences Error"
+msgstr "_Predvoľby"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Služba vrátila chybu"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Predvoľby"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktivovaná"
@@ -10224,59 +10178,59 @@ msgstr "?Vyžiadať (zápis): Žiadny"
 msgid "?password:Hidden"
 msgstr "Heslo:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Predvoľby"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Zvuk / Video"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Funkcia nie je dostupná pod Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10284,120 +10238,120 @@ msgid ""
 msgstr ""
 "Schopnosť odhadnúť čas nečinnosti v nastavení poradia automatických stavov."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Požaduje knižnicu libxss."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Vyžaduje python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Vyžaduje gpg a python-GnuPGInterface."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Spojenie"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Vyžaduje libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Funkcia nie je dostupná pod Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Oznámenia"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Vyžaduje python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Uložiť heslo"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Heslá môžu byť bezpečne uložené a nie sú v obyčajnom texte."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Požaduje gnome-keyring a python-gnome2-desktop, alebo kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Kontrola pravopisu"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Vyžaduje libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Vyžaduje python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Predvoľby"
@@ -10444,7 +10398,7 @@ msgstr "Nesprávny názov zoznamu"
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte vložiť názov, aby bolo možné vytvoriť nový súkromný zoznam."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Pozvať _kontakty"
@@ -10472,7 +10426,7 @@ msgstr "_Dokončiť"
 msgid "Commands"
 msgstr "príkaz"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10545,118 +10499,132 @@ msgstr "Požiadavka na prihlásenie od %s"
 msgid "Loading"
 msgstr "Kódim"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Pripojený"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Vyskytla sa chyba počas tvorby účtu"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Odstraňuje sa účet %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Kliknite pre zmenu hesla účtu"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Pripájanie"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Server nepodporuje Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Znak nie je povolený"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Server nepodporuje Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Pridať kontakt..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Vytvoriť novú správu"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Vlastný port musí byť číslo portu."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Pokročilé akcie"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Zakazujem %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Neznáma chyba SSL: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Odstraňuje sa účet %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registrovať na %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Účet"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Účty"
@@ -10699,252 +10667,256 @@ msgstr "Hľadať"
 msgid "No results found"
 msgstr "Žiadny výsledok"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Predvolené"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "text správy o stave"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Prihlásiť znovu?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Prihlásiť znovu?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Neplatný účet"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Neplatný účet"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Pozvať _kontakty"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Certifikát podpísaný sám sebou"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Prip_ojiť sa pri štarte programu Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Všetky stavy"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Použiť proxy pre prenos súborov"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " od %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Pozvať _kontakty"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktoré nie sú v zozname"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_ta:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "po_užiť premennú prostredia HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Prvé meno:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Posledné meno:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Nový e-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Upraviť stav"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Povoliť"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Spojenie"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Certifikát podpísaný sám sebou"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Uložiť heslo"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registrácia zlyhala"
@@ -10997,19 +10969,19 @@ msgstr[0] "Odstránených %s kontaktov"
 msgstr[1] "Odstránených %s kontaktov"
 msgstr[2] "Odstránených %s kontaktov"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Neznámy umelec"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Neznámy titulok"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Neznámy zdroj"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11023,21 +10995,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "Zálož_ky"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Súbor je prázdny"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11094,127 +11066,235 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Funkcie"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Kontrolovať pravopis vo vytvorených správach."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Prehliadanie služieb s použitím účtu %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontakty"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Diskuné skupiny"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Posledné:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Registrácia zlyhala"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Pokračovanie rozhovoru"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Neznáma chyba SSL: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Slovník pre jazyk %s nie je k dispozícii"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Potrebujete nainštalovať %s slovník, aby bolo možné prevádzať kontrolu "
+#~ "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
+#~ "nastavením premennej setting the speller_language."
+
+#~ msgid "_Reconnect"
+#~ msgstr "Znovu p_ripojiť"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Koniec"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Zobraziť len _aktívne kontakty"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Pridať kontakt..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Pozvať _kontakty"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Opustiť diskusnú skupinu"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Nová diskusná skupina"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej "
+#~ "neprečítané správy. Závisí na téme, ikonka môže byť animovaná."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Nepovolený znak v názve hostiteľa."
+
+#~ msgid "Server address required."
+#~ msgstr "Adresa serveru je požadovaná."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Nepovolený znak v názve účtu."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Nepovolený znak v zdroji."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Predbežné zobrazenie nových správ vo vyskakovacom oznámení?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Upozorniť ma, keď sa dokončí prenos"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Upozorniť ma, keď sa dokončí prenos"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Farba pozadia použitá pri prihlásení kontaktu."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Udalosť"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Udalosť"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Nie ste pripojený k serveru"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Konflikt zdroju"
 
@@ -11832,9 +11912,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Poslať súkromnú správu"
 
-#~ msgid "Send _File"
-#~ msgstr "Poslať _súbor"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Účastníci"
@@ -13847,10 +13924,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "uri"
 #~ msgstr "uri"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Registrácia zlyhala"
-
 #~ msgid "cyan"
 #~ msgstr "azúrová"
 
@@ -14331,9 +14404,6 @@ msgstr "Registrácia zlyhala"
 #~ "vlastný.\n"
 #~ "Zoberte v úvahu aj prípadné nastavenie firewallu."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Z_lúčiť účty"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
@@ -14765,9 +14835,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Vyžaduje python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Požaduje gnome-keyring a python-gnome2-desktop, alebo kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/sr.po b/po/sr.po
index fef95b3ad..98f69f765 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,77 +14,83 @@ msgstr ""
 "X-Pootle-Path: /sr/gajim/sr.po\n"
 "X-Pootle-Revision: 1037\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Налози"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "и пријављени"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "и НЕпријављени"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Одаберите слику"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Затворићете неколико језичака"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Не питај ме више"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Листа приватности"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Забрањујем %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Настави"
 
@@ -152,502 +158,497 @@ msgstr "Нема захтева за претплатом на чекању."
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Прикажи контакте који нису на вези"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Желио бих да Вас додам на листу мојих контаката."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Пошаљи једну _поруку..."
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Изврши наредбу"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "Преи_менуј"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Одблокирај"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Блокирај"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Уклони"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Информације"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Пошаљи _датотеку"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Сними датотеку као..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Сними датотеку као..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Последњи статус: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Позови контакте"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Додај контакт..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Захтев за преносом датотеке"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Приватни Разговори"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Информације"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Историјат"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Онемогућено"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Састављање"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Сви статуси"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Позови контакте"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Напусти групне разговоре"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Напусти групне разговоре"
+msgid "Rename…"
+msgstr "Преи_менуј"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Промени _тему..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Напусти групне разговоре"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Одаберите слику"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Нови групни разговор"
+msgid "Configure…"
+msgstr "_Конфигуриши"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Уништавам %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Регистрација неуспела"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Записуј у дневник статусне промене контаката"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Већ постављене поруке:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "Умањи прозор на затварање"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Умањи прозор на ауто повезивање"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Промени _надимак..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Глас"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Изврши наредбу"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Састављање"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Сви статуси"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Додај контакт..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "датотека"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Пошаљи једну _поруку..."
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Откривање сервиса"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Напредно"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Подешавања"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Листа забрана"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Маркирај ову со_бу"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Конфигурација собе"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Синхронизуј"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Админ"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Пошаљи серверску поруку..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Постави поруку дана..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Освежи поруку дана..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Избриши поруку дана"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Додај контакт..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Измени налог..."
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Измени налог..."
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Налози"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Копирај џабер ИД/е-мејл адресу"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Придружи се групном разговору"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Додај контакт..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Копирај локацију везе"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Отвори везу у интернет прегледачу"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Копирај џабер ИД/е-мејл адресу"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Отвори састављач е-мејла"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Копирај локацију везе"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Обавештење"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Копирај џабер ИД/е-мејл адресу"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Позо_ви"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Одблокирај"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Блокирај"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Избаци"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Забрани"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Власник"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Админ"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Члан"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Члан"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Глас"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Џабер ID собе:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "порука"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Смајлији:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Није могуће пронаћи дневник историјата базе података"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Датотека не постоји"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "АИМ адреса:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Датум"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -655,29 +656,29 @@ msgstr "Датум"
 msgid "Nickname"
 msgstr "Надимак"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Порука"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Тема"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Грешка са базом података"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "креирам базу дневника"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -690,49 +691,49 @@ msgstr ""
 "\n"
 "Уколико притисните Да, молимо сачекајте..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Почисти"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Ви"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s у %(time)s каже: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Обриши"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Поништи одобравање"
 msgstr[1] "Поништи одобравање"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Да ли заиста желите да избришете означену поруку?"
 msgstr[1] "Да ли заиста желите да избришете означену поруку?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Подразумевана порука"
 msgstr[1] "Подразумевана порука"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -740,232 +741,237 @@ msgstr[0] "Да ли заиста желите да избришете озна�
 msgstr[1] "Да ли заиста желите да избришете означене поруке?"
 msgstr[2] "Да ли заиста желите да избришете означене поруке?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име контакта: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Опште"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Група"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "У групи"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Постави расположење"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ништа"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Статусна порука"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Статусна порука"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Препиши статусну поруку?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Статусна порука"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Сними као већ постављену..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Молимо унесите име за ову статусну поруку"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Имам "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Статус"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Име"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Пошаљи _датотеку"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Сними датотеку као..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Преноси датотека"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Неисправна датотека"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Избацујем %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Листа забрана"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Захтев за преносом датотеке"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s је поставио тему на %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Соба сада приказује недоступне чланове"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "соба сада не приказује недоступне чланове"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Сесија НЕЋЕ бити памћена"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Информације о Вама, како су ускладиштене на серверу"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Соба сада више није анонимна"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Соба је сада полу анонимна"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Соба је сада потпуно анонимна"
@@ -980,7 +986,7 @@ msgstr "Понг! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Понг! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 #, fuzzy
 msgid "Error."
 msgstr "Грешка"
@@ -1010,22 +1016,22 @@ msgstr "Нова соба је направљена"
 msgid "Failed to Configure Group Chat"
 msgstr "Напусти групне разговоре"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Од сада сте познати као %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s је тренутно %(status)s"
@@ -1152,81 +1158,81 @@ msgstr "Јесте ли сигурни да желите напустити гр
 msgid "If you close this window, you will leave '%s'."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Прикажи листу форматирања"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Овак контакт не подржава пренос датотека."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Понг! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Пошаљи и затвори"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Нова Порука"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Пошаљи и затвори"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1235,186 +1241,177 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s је сада %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Преноси датотека"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Величина: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_Налози"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Није на вези"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Отвори садржавајућу фасциклу"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Позив на групни разговор"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Удаљени контакт је прекинуо пренос"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Грешка при отварању датотеке"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Пренос датотеке прекинут"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Није могуће успоставити везу са другом страном."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Прикажи догађај у листи контаката"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Напредна измена конфигурације"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Конфигурација собе"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Прикажи св_е догађаје на чекању"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Искаче прозор са следећим догађајем на чекању"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Започни разговор"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Преноси"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Групни разговори"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Ауторизација послата"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Ауторизација уклоњена"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
@@ -1424,7 +1421,7 @@ msgstr "Сада ће Вас контакт \"%s\" увек видети као
 msgid "desynced"
 msgstr "десинхронизован"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Гајим"
@@ -1444,7 +1441,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Увек затвори Гајим"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
@@ -1600,8 +1598,8 @@ msgstr "Преименуј групу"
 msgid "Please enter a new name"
 msgstr "Молимо Вас направите нову чисту тему са жељеним именом."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Преи_менуј"
@@ -1620,27 +1618,32 @@ msgstr "Желите ли уклонити групу %s са листе кон�
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Напусти групне разговоре"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Преименуј контакт"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Уклања контакт са листе"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Управо ћете уклонити \"%(name)s\" (%(jid)s) из ваше листе контаката.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1650,21 +1653,21 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Уклања контакт са листе"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1676,26 +1679,26 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Преименуј контакт"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1704,13 +1707,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1721,21 +1724,21 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Преименуј контакт"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Креативан"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1743,101 +1746,102 @@ msgstr[0] "Да ли желите послати ову датотеку кон�
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Пошаљи"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Пошаљи %s за %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Направи метаконтакте од %s и %s"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Направи метаконтакте од %s и %s"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "Објави песму"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Измени групе"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Преи_менуј"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "У_логуј се поново"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "_Изврши наредбу"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Историјат"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Посматрачи"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1966,70 +1970,70 @@ msgstr "Приватни Разговори"
 msgid "Messages"
 msgstr "Поруке"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Прихватате ли овај захтев?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Ауторизација послата"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Ауторизација послата"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ништа"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Захтев за претплатом"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Захтев за претплатом"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2038,150 +2042,150 @@ msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Укинута претплата"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Позвани сте у групни разговор"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сертификат је истекао"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Удаљени контакт је прекинуо пренос"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Грешка при отварању датотеке"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Грешка SSL сертификата"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Преноси датотека"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_У реду"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Захтев за преносом датотеке"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Несигурна веза"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2193,20 +2197,20 @@ msgstr ""
 "не препоручује.\n"
 "Да ли сте сигурни да желите да се повежете овако?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Повезивање"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2409,11 +2413,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Публикација vCard неуспела"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2745,78 +2749,73 @@ msgstr ""
 "Аргумент \"%(arg)s\" није наведен. \n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Уништавам %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Непозната SSL грешка: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Нова Приватна Порука"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Нова порука од %(nickname)s"
 msgstr[1] "Нова порука од %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Нови групни разговор"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s је променио статус"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s је тренутно %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s је на вези"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s је отишао"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Пријављивање са \"%s\" неуспешно"
@@ -2892,64 +2891,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Обавести ме о контактима који се _пријаве"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Обавести ме о контактима који се _одјаве"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Прегледај нове поруке у искачућим обавештењима?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Обавести ме када се заврши пренос датотеке"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Обавести ме када се заврши пренос датотеке"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Боја позадине контакта када тек дођу на везу."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Листа (одвојена бланко знаковима) редова (налога и група) који су отворени."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "подразумевано"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Језик који користи правопис"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2959,15 +2916,15 @@ msgstr ""
 "'понекад' - исписуј време сваких print_ichat_every_foo_minutes минута.\n"
 "'никад' - никад не исписуј време."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Сматрај * / _ парове као знакове за форматирање."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2976,7 +2933,7 @@ msgstr ""
 "Ако је истинито, не уклањај */_ . Тако ће *абв* бити подебљано, али "
 "иокружено са * *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2985,7 +2942,7 @@ msgstr ""
 "Карактер за додавање после надимка када се користи довршавање надимка "
 "(тастером tab) у групном разговору"
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2994,17 +2951,17 @@ msgstr ""
 "Карактер који желите додати после жељеног надимка уколико је жељени надимак "
 "у групном разговору већ употребљен"
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3017,23 +2974,23 @@ msgstr ""
 "документацију за strftime, за пуну документацију: http://docs.python.org/lib/"
 "module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Карактери који ће бити приказани пре надимка у разговору"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Карактери који ће бити приказани после надимка у разговору"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3042,12 +2999,12 @@ msgstr ""
 "Колико линија претходног разговора памтити када се прозор/језичак  за "
 "разговор поново отвори."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3056,19 +3013,19 @@ msgstr ""
 "Колико секунди чекати пре поновног аутоматског придруживања соби са које сте "
 "раскачени. Ставити 0 да онемогућите поновно аутоматско придруживање."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Пошаљи поруку са Ctrl+Enter, а са Enter прави нову линију. (Подразумевано "
 "понашање Миралабисовог ICQ клијента)"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Колико линија сачувати са Ctrl+KeyUP"
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3077,11 +3034,11 @@ msgstr ""
 "Или Ваш специфицирани УРЛ са %s у њему где је %s реч или фраза или 'ВИКИ-"
 "РЕЧНИК' што значи коришћење вики-речника."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ако је означено, Гајим се може контролисати коришћењем gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3090,15 +3047,15 @@ msgstr ""
 "Ако се не исписује време за сваку поруку (print_time==понекад), исписати га "
 "сваких x минута"
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питај пре затварања прозора/језичка групног разговора."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3108,7 +3065,7 @@ msgstr ""
 "податке (ћаскање, приватно ћаскање, групни разговор који неће бити "
 "минимизован)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3117,32 +3074,32 @@ msgstr ""
 "Листа хостова одвојена зарезима, коју шаљемо, уз локалне интерефејсе, за "
 "трансфер датотека, у случају прослеђивања порта/НАТовања."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандард дефинише КiБ = 1024 бајтова, КБ = 1000 бајтова"
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Обавести ме о свим догађајима у икони системске касете."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Прикажи језичак иако је само један разговор?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Прикаши границу свеске у прозорима разговора?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Прикаши дугме за затварање у језичку?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Прегледај нове поруке у искачућим обавештењима?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3151,7 +3108,7 @@ msgstr ""
 "Листа речи одвојена бланко карактерима које ће бити обојене у групним "
 "разговорима"
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3161,22 +3118,13 @@ msgstr ""
 "Ако је истинито, Гајим се завршава када се притисне X дугме. Ово подешавање "
 "се користи само ако је икона системске касете у употреби."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Ако је истинито, Гајим ће приказивати икону на сваком језичку који садржи "
-"непрочитане поруке. У зависности од теме, икона може бити и анимирана."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3185,14 +3133,14 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати статусну поруку (ако није празна) за "
 "сваки контакт у листи контаката"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Дефинишите позицију аватара у листи контаката. Може бити лево или десно"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3201,26 +3149,26 @@ msgstr ""
 "Ако је неистинито, више нећете видети статусну порукуу разговорима када "
 "контакт промени свој статус и/или статусну поруку."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Не приказуј листу контаката у системској касети."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3230,7 +3178,7 @@ msgstr ""
 "прозор бљеска (подразумевано понашање у већини менаџера прозора) при новим "
 "догађајима."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3251,7 +3199,7 @@ msgstr ""
 "'pertype' - Поруке истог типа (нпр., разговори и групни разговори) се шаљу у "
 "исти прозор."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3259,32 +3207,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Ако је истинито, притисак на тастер 'esc' затвара језичак/прозор."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Сакрива банер у прозору групног разговора."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Сакрива банер у прозору групног разговора."
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Сакрива листу учесника у прозору групног разговора"
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3293,18 +3241,18 @@ msgstr ""
 "У разговору, прикажи надимак на почетку новог реда само када се не ради о "
 "истој особи која је причала и у прошлој поруци."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Увлачење при коришћењу спајања узастопних надимака."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab иде на следећи језичак када нема непрочитаних језичака"
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3313,7 +3261,7 @@ msgstr ""
 "Треба ли приказивати дијалог за потврду блокирања контакта? Празна ниста "
 "значи да никада не приказујемо дијалог."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3322,7 +3270,7 @@ msgstr ""
 "Треба ли приказивати дијалог за потврду блокирања контакта? Празна ниста "
 "значи да никада не приказујемо дијалог."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3333,7 +3281,7 @@ msgstr ""
 "налог у прозору за измену подешавања налога. БУДИТЕ ОПРЕЗНИ, када сте "
 "повезани са негативним приоритетом НЕЋЕТЕ примати никакве поруке од сервера."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3342,7 +3290,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати укупан број корисника и број коринсика "
 "на вези у групним редовима."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3351,11 +3299,11 @@ msgstr ""
 "Ако је истинито, Гајим ће скроловати и означити контакт који Вам је последњи "
 "послао поруку, ако прозор разговора није отворен."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Време неактивности после кога се прозор за измену статуса затвара."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3363,12 +3311,7 @@ msgstr ""
 "Максимум порука које се приказују у разоговору. Најстарије линије се "
 "склањају."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-"Одаберите интервал између две провере да се ништа не дешава на рачунару."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3377,7 +3320,7 @@ msgstr ""
 "Исправне uri шеме. Само шеме са ове листе ће бити прихваћене као \"стварне\" "
 "uri. (mailto и xmpp се обрађују засебно)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3385,51 +3328,51 @@ msgstr ""
 "Ако је True, допуњавање у групним разговорима ће бити као допуњавање у "
 "конзоли"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3438,46 +3381,42 @@ msgstr ""
 "Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
 "подразумевана порука ће бити коришћена."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3486,7 +3425,7 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3495,7 +3434,7 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3504,7 +3443,7 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3513,7 +3452,7 @@ msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3522,28 +3461,32 @@ msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Маркирај ову собу"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3552,7 +3495,7 @@ msgstr ""
 "Приоритет ће се аутоматски променити у зависности од Вашег статуса. "
 "Приоритети су дефинсани у autopriority_* подешавањима."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3563,19 +3506,19 @@ msgstr ""
 "dnd, invisible. ПАЖЊА: ова опција се користи само ако је "
 "restore_last_status  онемогућена."
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Ако је омогућено, постави последњи коришћени статус."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Ако је True, контакти који траже ауторизацију ће аутоматски бити прихваћени."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3584,12 +3527,12 @@ msgstr ""
 "Ако је False, налог ће бити онемогућен и неће се приказивати у листи "
 "контаката."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Нисте повезани на сервер"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3597,22 +3540,22 @@ msgid ""
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3621,7 +3564,7 @@ msgstr ""
 "Колико секунди чекати на одговор о пакетима о живости пре него што покушамо "
 "поновно успостављање везе."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3630,20 +3573,20 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
 "подразумевана порука ће бити коришћена."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3651,17 +3594,17 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3670,28 +3613,24 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Грешка SSL сертификата"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3700,41 +3639,41 @@ msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Омогући ESessions енкрипцију за овај налог."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3743,91 +3682,91 @@ msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Једем"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Радим."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Филм"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Радим."
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Радим."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Напољу"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3837,1060 +3776,1060 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "За"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: није могуће отворити %s за читање"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Групни разговори"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Позив на групни разговор"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Позив на групни разговор"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Групни разговори"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Групни разговори"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Стварање групних разговора Вам није дозвољено."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Нови групни разговор"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Услуга не може бити нађена"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Ово није групни разговор"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Рачун локал већ постоји."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Групни разговор <b>%s</b> не постоји."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Групни разговори"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Обавља рутину"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Купује намирнице"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Чисти"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Кува"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Обавља одржавање"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Пере судове"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Пере веш"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Баштовани"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "На задатку"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Шета пса"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Пије"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Пије пиво"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Пије кафу"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Пије чај"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Ужина"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Доручкује"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Руча"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Вечера"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Вежба"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Вози бициклу"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Плеше"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Шета"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Џогира"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Бави се спортом"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Трчи"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Скија"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Плива"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Вежба"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Чешља се"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "У бањи"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Пере зубе"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Шиша се"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Брије се"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Купа се"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Тушира се"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Састанчи"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Неактивно"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Слободан дан"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Блеји"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Крије се"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "На одмору"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Моли се"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Заказани одмор"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Размишља"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Одмара се"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Пеца"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Игра игрице"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Излази напоље"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "На проводу"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Чита"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Увежбава"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "У шопингу"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Пуши"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Дружи се"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Сунча се"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Гледа ТВ"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Гледа филм"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Прича"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "У стварном животу"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Телефонира"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "На видео телефону"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Путује"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Мува се"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Вози"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "У колима"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "У аутобусу"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "У авиону"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "У возу"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "На путу"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Шета"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Програмира"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "На састанку"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Учи"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Пише"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Одушевљен"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Заљубљен"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Љут"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Изнервиран"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Анксиозан"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Напаљен"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Посрамљен"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Сморен"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Храбар"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Миран"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Опрезан"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Смрзнут"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Поуздан"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Збуњен"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Задубљен у мисли"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Задовољан"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "На крају живаца"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Луд"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Креативан"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Заинтересован"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Потиштен"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Депресиван"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Разочаран"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Згађен"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Скрхан"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Ометен"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Постиђен"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Завидљив"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Узбуђен"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "За флертовање"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Фрустриран"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Захвалан"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "У патњи"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Мргудан"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Крив"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Срећан"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "У надању"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Наложен"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Скроман"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Понижен"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Гладан"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Повређен"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Импресиониран"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Очаран"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Заљубљен"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Озлојеђен"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Заинтересован"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Отрован"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Непобедив"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Љубоморан"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Усамљен"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Изгубљен"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Срећан"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Злобан"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Расположен"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Нервозан"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Неутралан"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Увређен"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Побеснео"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Играо би се"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Поносан"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Опуштен"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Олакшан"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Самилостан"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Неуморан"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Тужан"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Саркастичан"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Задовољан"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Озбиљан"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Стидљив"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Болестан"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Поспан"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Спонтан"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Под стресом"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Јак"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Изненађен"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Захвалан"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Жедан"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Уморан"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Недефинисан"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Слаб"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Забринут"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "подразумевано"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "морска"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Крије се"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Налог"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Налог"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Опис"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Грешка"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "један"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "соба"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Нисам успео да узмем сертификат издавача"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Нисам успео да узмем CRL сертификата"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Нисам успео да дешифрујем потпис сертификата"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Нисам успео да дешифрујем CRL сертификата"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Нисам успео да декодирам јавни кључ издавача"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Грешка у потпису сертификата"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Грешка у CRL сертификата"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Сертификат још није валидан"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Сертификат је истекао"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL није још валидан"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL је истекао"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка у формату сертифаковог поља од када је валидан"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка у формату сертифаковог поља до када је валидан"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Грешка у формату CRL-овогпоља последњег ажурирања"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Грешка у формату CRL-овогпоља следећег ажурирања"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Немам више меморије"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Самопотписани сертификат"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопотписани сертификат у ланцу сертификата"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "У немогућности да узмем сертификат локалног издавача"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "У немогућности да верификујем први сертификат"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Ланац сертификата предугачак"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Сертификат повучен"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Неисправан сертификат сертификационог тела (CA)"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Прекорачена дужина путање"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Неподржана сврха сертификата"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Сертификату се не верује"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Сертификат одбачен"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Погрешна тема издавача сертификата"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификатор кључа ауторизатора и теме се не поклапају"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серијски број ауторизатора и издавача се не поклапају"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Употреба кључа не укључује потписивање сертификата"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Сертификат повучен"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Непозната SSL грешка: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Сертификат је истекао"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Ауторизација прихваћена"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Смајлији искључени"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Сертификат је истекао"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Захтев за претплатом"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Екстензија није подржана"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Пријављивање са \"%s\" неуспешно"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4952,12 +4891,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Конфигурација собе"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4969,222 +4908,192 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Неисправан карактер у имену хоста."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Потребна је адреса сервера."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Неисправан карактер у корисничком имену."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Неисправан карактер у ресурсу."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Заузет"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Недоступан"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Одсутан"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Није на вези"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?контакт има статус:Непознат"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?контакт има статус:Постоје грешке"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Тренутна претплата:Ниједна"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "За"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Од"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Обоје"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?ОС:Непознат"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Питај (за претплату):Ниједна"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Модератори"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Учесници"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Учесник"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Везаност контакта у групном разоговру:Никаква"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Власник"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Власник"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Члан"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Члан"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише поруку..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5192,22 +5101,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "у _групним разговорима"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " од корисника %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " од %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5215,50 +5124,39 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Гајим"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Гајим - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Желио бих да Вас додам на листу мојих контаката."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Слика је превелика"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL није још валидан"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s је датотека, али би требала бити фасцикла"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Гајим ће се сада завршити"
 
@@ -5362,83 +5260,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Желео бих да те додам на моју листу контаката."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Датотека је празна"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E енкрипција онемогућена"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Измени статусне информације"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Измени статус"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Постави тип присутности и опис"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Слободан за разговор"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "На вези"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Дуже одсутан"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Не сметај"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Није на вези"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Опис присутности:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Статус се променио."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Послати контакти: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Послати контакти:"
 
@@ -5461,7 +5359,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Налог"
 
@@ -5472,7 +5370,7 @@ msgstr "Групни разговори"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Лозинка:"
@@ -5496,7 +5394,7 @@ msgstr "у _групним разговорима"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Придружи се"
@@ -5514,17 +5412,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Одустани"
 
@@ -5672,7 +5570,7 @@ msgstr "Информације контакта"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Опис"
 
@@ -5877,39 +5775,44 @@ msgstr "Посао"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "О"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Придружи се групном разговору"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Враћам се брзо"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Придружи се"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Уклањање рачуна %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5978,6 +5881,7 @@ msgid "Strike"
 msgstr "Прецртано"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Боја"
 
@@ -5990,139 +5894,134 @@ msgstr "Фонт"
 msgid "Clear formatting"
 msgstr "Очисти форматирање"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Шифровање лозинком"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Прикажи листу смајлија (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Забрана..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Промени _надимак..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Промени _тему..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Унесите нову лозинку:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Напусти групне разговоре"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Ако је означено, Гајим ће се придружити овом групном разговору при покретању"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Догодила се грешка:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Потврдите поново..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Учесник"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Избаци"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Можете такође унети и алтернативну локацију:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Учесник"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Забрани"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Нови групни разговор"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Уништавам %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Можете такође унети и алтернативну локацију:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Разлог"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Унесите ново име за групу %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Позо_ви"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "догађај"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "догађај"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6220,20 +6119,20 @@ msgid "Add"
 msgstr "Додате"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Уклони"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Статус"
 
@@ -6243,7 +6142,7 @@ msgid "Client"
 msgstr "<b>Клијент:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Систем:</b>"
@@ -6384,38 +6283,39 @@ msgstr "Понашање прозора:"
 msgid "_Show contact list on startup"
 msgstr "_Прикажи листу контаката"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Споји налоге"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Прикажи _аватаре контаката на листи"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6424,12 +6324,12 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати аватаре контаката у листи контаката и "
 "у групним разговорима"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Прикажи статусне поруке контаката на листи"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6438,53 +6338,53 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати статусне поруке контаката испод имена "
 "контакта у листи контаката и у групним разговорима"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Прикажи _расположења контаката на листи"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Сортирај контакте по статусу"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Послати контакти:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "у _групним разговорима"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Размена ставки контаката"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Провера правописа"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6497,29 +6397,29 @@ msgstr ""
 "поље за унос, подразумевани језик ће бити коришћен за овај контакт или "
 "групни разговор."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "садржај поруке"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Прикажи листу форматирања"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Прикажи статусне поруке контаката на листи"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6528,58 +6428,58 @@ msgstr ""
 "Ако је неистинито, више нећете видети статусну порукуу разговорима када "
 "контакт промени свој статус и/или статусну поруку."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Регистрација неуспела"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Записуј у дневник статусне промене контаката"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Прикаши дугме за затварање у језичку?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6588,116 +6488,119 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Прикаши дугме за затварање у језичку?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
+"систем користите"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Последњи статус: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Разговори"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Notification-daemon"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Када се прими нови догађај:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Омогући искачуће прозоре/обавештења када сам _одсутан/недоступан/запослен/"
 "невидљив"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Омогући искачуће прозоре/обавештења када сам _одсутан/недоступан/запослен/"
 "невидљив"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Обавести ме о контактима који се _пријаве"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Обавести ме о контактима који се _одјаве"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Визуална обавештења</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Пуштај звукове"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Поде_си..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Доз_воли звукове када сам заузет"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav Звукови"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Обавештења"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Недоступан"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6706,7 +6609,7 @@ msgstr ""
 "Ако је означена, Гајим ће променити статус у Недоступан када рачунар још "
 "дуже није у употреби"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6715,7 +6618,7 @@ msgstr ""
 "Ако је означена, Гајим ће променити статус у Недоступан када рачунар још "
 "дуже није у употреби"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6728,7 +6631,7 @@ msgstr ""
 "$S ће бити замењено претходном статусном поруком\n"
 "$T ће бити замењено са временом одсутности"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6741,40 +6644,40 @@ msgstr ""
 "$S ће бити замењено претходном статусном поруком\n"
 "$T ће бити замењено са временом недоступности"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "минута"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Аутоматски статус"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Питај за статусну поруку при:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Пријављивању"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Одјављивању"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6782,68 +6685,68 @@ msgstr ""
 "Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
 "подразумевана порука ће бити коришћена."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Подразумевана порука"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Омогућен"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Статусна порука"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Већ постављене статусне поруке</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Тема"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Тема"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Конфигурисање боје и фонта интерфејса"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Гајим - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Гајим - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Скуп статусних икона:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Користи иконе за _транспорте"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6852,117 +6755,127 @@ msgstr ""
 "Ако је означено, Гајим ће користити статусне иконе специфичне за протокол. "
 "(нпр. контакт са МСН-а ће имати мсн иконе за своје статусе)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Стил"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Могућности"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Подразумевана порука"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Приватни Разговори"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Веза"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Сервер:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Подеси..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Записуј у дневник статусне промене контаката"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Ако је означено, Гајим ће памтити лозинку за овај налог"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Остало</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Отвори..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Напредна измена конфигурације"
@@ -7146,12 +7059,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Унесите нову лозинку:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Регистрација неуспела"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Користи Ваше одређено име хоста/порт "
@@ -7237,7 +7150,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Пријављивању"
@@ -7251,7 +7164,7 @@ msgstr "Молимо Вас направите нову чисту тему са
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7281,8 +7194,8 @@ msgstr "_Поново учитај подразумеване боје"
 msgid "Resets value to default"
 msgstr "_Поново учитај подразумеване боје"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Име хоста:"
@@ -7325,7 +7238,7 @@ msgstr "Самопотписани сертификат"
 msgid "Proxy Host"
 msgstr "Прокси _хост:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Тип"
 
@@ -7339,8 +7252,7 @@ msgstr "_Протокол:"
 msgid "Copy info to clipboard"
 msgstr "_Копирај локацију везе"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Могућности"
 
@@ -7527,6 +7439,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Измени статусну поруку"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Гајим"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Расположење:</b>"
@@ -7603,8 +7520,8 @@ msgstr "Застој"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7794,79 +7711,106 @@ msgstr "Регистрација неуспела"
 msgid "_Name"
 msgstr "_Име:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Прок_си:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Започни разговор"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Напусти групне разговоре"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Управник историјатом"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Регистрација неуспела"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Подешавања"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Налози"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Приказ"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Прикажи само _активне контакте"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Прикажи контакте који нису на вези"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Прикажи само _активне контакте"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Прикажи транс_порте"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML Конзола"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Преноси датотека"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Помоћ"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "На вези"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "На вези"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Могућности"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "О"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7881,6 +7825,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Напусти групне разговоре"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8165,61 +8114,69 @@ msgstr "Размена ставки контаката"
 msgid "Create new group chat"
 msgstr "Напусти групне разговоре"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Подешавања"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Преноси датотека"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "статусна порука"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Прикажи _XML Конзолу"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Изглед разговора</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Прикажи контакте који нису на вези"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Прикажи само _активне контакте"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Прикажи само _активне контакте"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 #, fuzzy
 msgid "Contacts"
 msgstr "Контакт"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Информације контакта"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Преименуј контакт"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Послати контакти:"
@@ -8296,12 +8253,16 @@ msgstr "Попуните формулар."
 msgid "Group Chat Configuration"
 msgstr "Позив на групни разговор"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML Конзола"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Започни разговор"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Филтер:"
@@ -8347,11 +8308,6 @@ msgstr "Прикажи св_е догађаје на чекању"
 msgid "Mute Sounds"
 msgstr "Угаси звукове"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Подешавања"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8668,124 +8624,124 @@ msgstr "Пренос датотеке %(filename)s од контакта %(name)
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s се придружио групном разговору"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Групни разговори"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Групни разговори"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Услуга не може бити нађена"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Групни разговори"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Групни разговори"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Групни разговори"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Позив на групни разговор"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Сесија НЕЋЕ бити памћена"
@@ -8814,7 +8770,7 @@ msgid "Sender: %s"
 msgstr "Пошаљилац: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Примаоц: "
 
@@ -8966,7 +8922,7 @@ msgstr "Датотека: "
 msgid "It is not possible to send empty files"
 msgstr "Није могуће послати празну датотеку"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Пошаљилац: "
 
@@ -8981,7 +8937,7 @@ msgid "Change"
 msgstr "Промени _надимак..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Враћам се брзо"
@@ -9012,11 +8968,12 @@ msgid "Password Change Failed"
 msgstr "Лозинка захтевана"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Појавила се грешка при креирању налога"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Измени лозинку"
 
@@ -9054,40 +9011,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Непозната SSL грешка: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Настављени разговор"
+msgid "Start / Join Chat"
+msgstr "Започни разговор"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Додај контакт..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s није пронађен"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Овај сервис још није пружио детаљне информације"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9096,33 +9048,33 @@ msgstr ""
 "Овај сервис није могао одговорити са детаљним информацијама.\n"
 "Највероватније је застарео или у квару"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Остали"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Групни разговори"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Без успостављене везе, не можете разгледати доступне услуге"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откривање услуга са налога %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Откривање Услуга"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Услуга не може бити нађена"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9130,143 +9082,143 @@ msgstr ""
 "На наведеној адреси нема усуга, или нема одговора. Проверите адресу и "
 "покушајте поново."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Услуге нису претраживе"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Овај тип услуге не садржи елементе за претрагу"
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Неисправано име сервера"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Претражујем %(address)s користећи налог %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Преглед"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Ова услуга не садржи елементе за претрагу"
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "наредба"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Ре_гистрација"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Претрага"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Измени"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Скенирање %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Корисници"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Идентификација"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Претплаћен"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Чвор"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Нова објава"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Претплати се"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Пошаљи једну _поруку..."
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "тема"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Самостална Порука"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Карактер није дозвољен"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Није могуће послати поруку за %s, овај џабер ИД није исправан."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
@@ -9312,93 +9264,75 @@ msgstr "Регистрација успешна"
 msgid "Registration failed"
 msgstr "Регистрација неуспела"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Речник за језик %s није доступан"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Морате инсталирати %s речник како бисте могли користити проверу правописа, "
-"или одаберите други језик поставком speller_language опције.\n"
-"\n"
-"Осветљавање лоше написаних речи неће бити у употреби"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Самопотписани сертификат"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "за налог %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "ГГ Број:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Позив на групни разговор"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -9413,6 +9347,11 @@ msgstr "ГГ Број:"
 msgid "ICQ Number"
 msgstr "ICQ Број:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Додај контакт..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9468,7 +9407,7 @@ msgstr "Грешка приликом додавања сервиса. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9630,43 +9569,63 @@ msgstr "Контакт Отишао Са Везе"
 msgid "Contact Connected Background "
 msgstr "Контакт На Вези"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Статусна порука"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Статусна порука"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Статусна порука"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Статусна порука"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Гајим - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Неисправан надимак"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Карактер није дозвољен"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Да ли заиста желите да избришете означену поруку?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Активно"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Регистрација неуспела"
@@ -9690,10 +9649,9 @@ msgid "Error: %s"
 msgstr "Грешка: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Грешка"
 
@@ -9707,48 +9665,48 @@ msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Све датотеке"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Чисти"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Подешавање прокси профила"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Прок_си:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "По_деси према статусу"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Није на вези"
@@ -9769,7 +9727,7 @@ msgstr "Налог"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Ваш нови налог је успешно направљен"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9801,60 +9759,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Синхронизуј"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Шта желите да урадите?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Повезивање"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Проследи непрочитане поруке"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+ Џабер клијент"
@@ -9913,127 +9876,127 @@ msgstr "Захвалан"
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Одаберите датотеку за слање..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Одаберите слику"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Све датотеке"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Све датотеке"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Пошаљи _датотеку"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Слике"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Одаберите слику"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Све датотеке"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Сними датотеку као..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s овог групног разговора"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "На вези"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Ван везе"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Име датотеке: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Скидање"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Слање"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Пренос датотеке заустављен"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Опис:"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?статус преноса:Паузиран"
@@ -10042,7 +10005,7 @@ msgstr "?статус преноса:Паузиран"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Неисправна датотека"
@@ -10098,26 +10061,26 @@ msgstr "Бојење Порука Са Групног Разговора"
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Лозинка захтевана"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Да"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Ништа"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Одустани"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10136,11 +10099,6 @@ msgstr "користећи рачун %s"
 msgid "Hide _Contact List"
 msgstr "Позови контакте"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Прикажи само _активне контакте"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
@@ -10190,36 +10148,31 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Подешавања"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Подешавања"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Нисте повезани на сервер"
+msgid "Archiving Preferences Error"
+msgstr "_Подешавања"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Грешка у примању форме за податке"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Подешавања"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Активирано"
@@ -10268,59 +10221,59 @@ msgstr "?Питај (за претплату):Ниједна"
 msgid "?password:Hidden"
 msgstr "Лозинка:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Подешавања"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Могућност није доступна под Виндоуз системом."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10329,121 +10282,121 @@ msgstr ""
 "Даје могућност мерења времена када се ништа не дешава, да се одреди ауто "
 "статус."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Захтева libxss библиотеку."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr "Разговор без сервера са аутодетекцијом клијената у локалној мрежи."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Захтева python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Захтева python-dbus."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Веза"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Захтева libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Могућност није доступна под Виндоуз системом."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Обавештења"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Захтева python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Сачувај лозинку"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Лозинке се могу сачувати и поузданије од обичног текста."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Захтева gnome-network-manager и python-dbus."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Провера правописа"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Захтева libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Захтева python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Подешавања"
@@ -10490,7 +10443,7 @@ msgstr "Неисправно име листе"
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Позови контакте"
@@ -10518,7 +10471,7 @@ msgstr "_Заврши"
 msgid "Commands"
 msgstr "наредба"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10591,118 +10544,132 @@ msgstr "Захтев претплате од %s"
 msgid "Loading"
 msgstr "Програмира"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "На вези"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Уклањање рачуна %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Кликните за измену лозинке Вашег налога"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Повезивање"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Ваш сервер не подржава Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Карактер није дозвољен"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Ваш сервер не подржава Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Веза прекинута"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Додај контакт..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Направи нову објаву"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Ваш порт мора бити број порта."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Регистрација неуспела"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Забрањујем %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Непозната SSL грешка: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Уклањање рачуна %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Региструј се на %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Налог"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Налози"
@@ -10745,253 +10712,257 @@ msgstr "Претрага"
 msgid "No results found"
 msgstr "Нема резултата"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Подразумевано"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "наслов статусне поруке"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "текст статусне поруке"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Отићи са везе и повезати се одмах?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Отићи са везе и повезати се одмах?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Неисправан налог"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Неисправан налог"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Позови контакте"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Самопотписани сертификат"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "По_вежи се приликом покретања Гајима"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Сними дневник разговора за све контакте"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Статус"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Мења статус једног или више налога"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Користи прокси за пренос датотека"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " од %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Самопотписани сертификат"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Позови контакте"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Игнориши догађаје од контаката који нису на листи"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Приори_тет"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "користи HTTP_PROXY променљив_у окружења"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Мења статус једног или више налога"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Име:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Презиме:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Нови Е-мејл"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "По_деси према статусу"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 #, fuzzy
 msgid "Enable"
 msgstr "Омогућен"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Веза"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Самопотписани сертификат"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Самопотписани сертификат"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Обавештења"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Сачувај лозинку"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Регистрација неуспела"
@@ -11044,19 +11015,19 @@ msgstr[0] "Уклања контакт са листе"
 msgstr[1] "Уклања контакт са листе"
 msgstr[2] "Уклања контакт са листе"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Непознат извођач"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Непознат наслов"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Непознат извор"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11070,22 +11041,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Маркирај ову со_бу"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Датотека је празна"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Сервис је послао лоше податке"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11142,127 +11113,236 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Прикажи св_е догађаје на чекању"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Могућности"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Провера правописа састављених порука."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Откривање услуга са налога %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Контакт"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Групни разговори"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Недавно:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Регистрација неуспела"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Настављени разговор"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Непозната SSL грешка: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Гајим - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr ""
+#~ "Одаберите интервал између две провере да се ништа не дешава на рачунару."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Речник за језик %s није доступан"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Морате инсталирати %s речник како бисте могли користити проверу "
+#~ "правописа, или одаберите други језик поставком speller_language опције.\n"
+#~ "\n"
+#~ "Осветљавање лоше написаних речи неће бити у употреби"
+
+#~ msgid "_Reconnect"
+#~ msgstr "У_логуј се поново"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Прикажи само _активне контакте"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Додај контакт..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Позови контакте"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Напусти групне разговоре"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Нови групни разговор"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Ако је истинито, Гајим ће приказивати икону на сваком језичку који садржи "
+#~ "непрочитане поруке. У зависности од теме, икона може бити и анимирана."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Неисправан карактер у имену хоста."
+
+#~ msgid "Server address required."
+#~ msgstr "Потребна је адреса сервера."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Неисправан карактер у корисничком имену."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Неисправан карактер у ресурсу."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Обавести ме о контактима који се _пријаве"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Обавести ме о контактима који се _одјаве"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Прегледај нове поруке у искачућим обавештењима?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Обавести ме када се заврши пренос датотеке"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Обавести ме када се заврши пренос датотеке"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Боја позадине контакта када тек дођу на везу."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "догађај"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "догађај"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Нисте повезани на сервер"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Конфликт ресурса"
 
@@ -11894,9 +11974,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Пошаљи приватну поруку"
 
-#~ msgid "Send _File"
-#~ msgstr "Пошаљи _датотеку"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Учесници"
@@ -14072,10 +14149,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Застој"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Регистрација неуспела"
-
 #~ msgid "cyan"
 #~ msgstr "цијан"
 
@@ -14245,10 +14318,6 @@ msgstr "Регистрација неуспела"
 #~ msgstr "Аутодетекција статуса мреже."
 
 #, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Захтева gnome-network-manager и python-dbus."
-
-#, fuzzy
 #~ msgid "Feature not available, see Help->Features"
 #~ msgstr "Могућност није доступна под Виндоуз системом."
 
@@ -14566,9 +14635,6 @@ msgstr "Регистрација неуспела"
 #~ "неодговарајући за Ваша подешавања, овде можете одабрати неки други.\n"
 #~ "Могли бисте узети у обзир и могућност измене подешавања firewall-а."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Споји налоге"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP није могуће користити на овом рачунару"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 1c768f7dc..87b061e15 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-10-29 23:50+0100\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -21,78 +21,84 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Nalozi"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "i prijavljeni"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "i NEprijavljeni"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s šifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Odaberite sliku"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Zatvorićete nekoliko jezičaka"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Lista privatnosti"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Zabranjujem %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 "Ako pošaljete datoteku kontaktu %s, on/ona će znati Vaš pravi džaber ID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Nastavi"
 
@@ -160,230 +166,222 @@ msgstr "Nema zahteva za pretplatom na čekanju."
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Prikaži kontakte koji nisu na vezi"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Želio bih da Vas dodam na listu mojih kontakata."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Pošalji _jednu poruku"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Izvrši naredbu"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Preimenuj"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Ukloni"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Informacije"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Pošalji _datoteku"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Snimi datoteku kao..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Snimi datoteku kao..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Poslednji status: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Pozovi kontakte"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Privatni Razgovori"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "Informacije"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Istorijat"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Sastavljanje"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Svi statusi"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Pozovi kontakte"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Napusti grupne razgovore"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Napusti grupne razgovore"
+msgid "Rename…"
+msgstr "_Preimenuj"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Promeni _temu..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Napusti grupne razgovore"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Odaberite sliku"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Novi grupni razgovor"
+msgid "Configure…"
+msgstr "_Konfiguriši"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Uništavam %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registracija neuspela"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Već postavljene poruke:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "Umanji prozor na zatvaranje"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Umanji prozor na auto povezivanje"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Promeni _nadimak..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Glas"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Izvrši naredbu"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -391,272 +389,275 @@ msgstr[0] "Pre %i dana"
 msgstr[1] "Pre %i dana"
 msgstr[2] "Pre %i dana"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Sastavljanje"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Svi statusi"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "datoteka"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Pošalji _jednu poruku"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Otkrivanje servisa"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Napredno"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Podešavanja"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Lista zabrana"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Markiraj ovu so_bu"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Konfiguracija sobe"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Sinhronizuj"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Pošalji serversku poruku..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Postavi poruku dana..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Osveži poruku dana..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Izbriši poruku dana"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "Izmeni nalog"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "Izmeni nalog"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Nalozi"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopiraj džaber ID/e-mejl adresu"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Dodaj kontakt..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otvori vezu u internet pregledaču"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiraj džaber ID/e-mejl adresu"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otvori sastavljač e-mejla"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Obaveštenje"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopiraj džaber ID/e-mejl adresu"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Pozo_vi"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Odblokiraj"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Blokiraj"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Izbaci"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Zabrani"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Vlasnik"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Član"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Član"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Glas"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Džaber ID sobe:"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "poruka"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Smajliji:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Datoteka ne postoji"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM adresa:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -664,29 +665,29 @@ msgstr "Datum"
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Poruka"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Greška sa bazom podataka"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "kreiram bazu dnevnika"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -699,28 +700,28 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, molimo sačekajte..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "_Počisti"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Vi"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s u %(time)s kaže: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Obriši"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -728,7 +729,7 @@ msgstr[0] "Poništi odobravanje"
 msgstr[1] "Poništi odobravanje"
 msgstr[2] "Poništi odobravanje"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -736,7 +737,7 @@ msgstr[0] "Da li zaista želite da izbrišete označenu poruku?"
 msgstr[1] "Da li zaista želite da izbrišete označenu poruku?"
 msgstr[2] "Da li zaista želite da izbrišete označenu poruku?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -744,7 +745,7 @@ msgstr[0] "Podrazumevana poruka"
 msgstr[1] "Podrazumevana poruka"
 msgstr[2] "Podrazumevana poruka"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -752,232 +753,237 @@ msgstr[0] "Da li zaista želite da izbrišete označenu poruku?"
 msgstr[1] "Da li zaista želite da izbrišete označene poruke?"
 msgstr[2] "Da li zaista želite da izbrišete označene poruke?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Opšte"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupa"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "U grupi"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Postavi raspoloženje"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ništa"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna poruka"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Statusna poruka"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Prepiši statusnu poruku?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Ovo ime se već koristi. Da li želite da prepišete ovu statusnu poruku?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Statusna poruka"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Snimi kao već postavljenu..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Imam "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Ime"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete se sinhronizovati sa nalogom ako niste povezani."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Pošalji _datoteku"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Snimi datoteku kao..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Prenosi datoteka"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Neispravna datoteka"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Izbacujem %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Lista zabrana"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Soba sada prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "soba sada ne prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Sesija NEĆE biti pamćena"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Soba sada više nije anonimna"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Soba je sada polu anonimna"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Soba je sada potpuno anonimna"
@@ -992,7 +998,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Greška."
 
@@ -1021,22 +1027,22 @@ msgstr "Nova soba je napravljena"
 msgid "Failed to Configure Group Chat"
 msgstr "Napusti grupne razgovore"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s je trenutno %(status)s"
@@ -1164,81 +1170,81 @@ msgid "If you close this window, you will leave '%s'."
 msgstr ""
 "Ako zatvorite ovaj prozor, bićete isključeni sa ovoh grupnog razgovora."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Prikaži listu formatiranja"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ovak kontakt ne podržava prenos datoteka."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Pošalji i zatvori"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nova Poruka"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Pošalji i zatvori"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1247,186 +1253,177 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s je sada %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Prenosi datoteka"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Veličina: %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_Nalozi"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Nije na vezi"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otvori sadržavajuću fasciklu"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Udaljeni kontakt je prekinuo prenos"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Greška pri otvaranju datoteke"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke prekinut"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Prikaži događaj u listi kontakata"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Napredna izmena konfiguracije"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Konfiguracija sobe"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Prikaži sv_e događaje na čekanju"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "Iskače prozor sa sledećim događajem na čekanju"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Započni razgovor"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Prenosi"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Grupni razgovori"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizacija poslata"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Ako kontakt \"%s\" prihvati ovaj zahtev, znaćete njegov/njen status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizacija uklonjena"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
@@ -1436,7 +1433,7 @@ msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
 msgid "desynced"
 msgstr "desinhronizovan"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1456,7 +1453,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Uvek zatvori Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Izlaz"
@@ -1613,8 +1611,8 @@ msgstr "Preimenuj grupu"
 msgid "Please enter a new name"
 msgstr "Molimo Vas napravite novu čistu temu sa željenim imenom."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Prei_menuj"
@@ -1633,27 +1631,32 @@ msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Ujedno uklonja i sve kontakte iz ove grupe iz liste kontakata"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Napusti grupne razgovore"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Preimenuj kontakt"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Upravo ćete ukloniti \"%(name)s\" (%(jid)s) iz vaše liste kontakata.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1663,21 +1666,21 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status i nakon uklanjanja"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1689,26 +1692,26 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Preimenuj kontakt"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate kreirati nalog pre nego što možete da razgovarate sa ostalim "
 "kontaktima."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1717,13 +1720,13 @@ msgstr ""
 "Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
 "neće biti sačuvane pri sledećem povezivanju."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1734,21 +1737,21 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Preimenuj kontakt"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativan"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1756,101 +1759,102 @@ msgstr[0] "Da li želite poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Da li želite poslati ove datoteke kontaktu %s:"
 msgstr[2] "Da li želite poslati ove datoteke kontaktu %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Pošalji %s za %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Napravi metakontakte od %s i %s"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Napravi metakontakte od %s i %s"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi pesmu"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Izmeni _grupe"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Prei_menuj"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "U_loguj se ponovo"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "_Izvrši naredbu"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Istorijat"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1979,70 +1983,70 @@ msgstr "Privatni Razgovori"
 msgid "Messages"
 msgstr "Poruke"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Autorizacija poslata"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Autorizacija poslata"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ništa"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Zahtev za pretplatom"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Zahtev za pretplatom"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2051,150 +2055,150 @@ msgstr ""
 "Uvek ćete ga/je videti kao da nije na vezi.\n"
 "Da li želite da ga/je uklonite sa liste kontakata?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Ukinuta pretplata"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Sertifikat je istekao"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Udaljeni kontakt je prekinuo prenos"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Greška pri otvaranju datoteke"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Greška SSL sertifikata"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prenosi datoteka"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_U redu"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Nesigurna veza"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2204,20 +2208,20 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Povezivanje"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2419,11 +2423,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Publikacija vCard neuspela"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2754,28 +2758,23 @@ msgstr ""
 "Argument \"%(arg)s\" nije naveden. \n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je fascikla, ali bi trebala biti datoteka"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Uništavam %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nepoznata SSL greška: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2783,50 +2782,50 @@ msgstr[0] "Nova poruka od %(nickname)s"
 msgstr[1] "Nova poruka od %(nickname)s"
 msgstr[2] "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Novi grupni razgovor"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je promenio status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s je na vezi"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s je otišao"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Prijavljivanje sa \"%s\" neuspešno"
@@ -2903,64 +2902,22 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Obavesti me o kontaktima koji se _prijave"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Obavesti me o kontaktima koji se _odjave"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Obavesti me kada se završi prenos datoteke"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Obavesti me kada se završi prenos datoteke"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Boja pozadine kontakta kada tek dođu na vezu."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "podrazumevano"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Jezik koji koristi pravopis"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2970,15 +2927,15 @@ msgstr ""
 "'ponekad' - ispisuj vreme svakih print_ichat_every_foo_minutes minuta.\n"
 "'nikad' - nikad ne ispisuj vreme."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Smatraj * / _ parove kao znakove za formatiranje."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2987,7 +2944,7 @@ msgstr ""
 "Ako je istinito, ne uklanjaj */_ . Tako će *abv* biti podebljano, ali "
 "iokruženo sa * *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2996,7 +2953,7 @@ msgstr ""
 "Karakter za dodavanje posle nadimka kada se koristi dovršavanje nadimka "
 "(tasterom tab) u grupnom razgovoru"
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -3005,17 +2962,17 @@ msgstr ""
 "Karakter koji želite dodati posle željenog nadimka ukoliko je željeni "
 "nadimak u grupnom razgovoru već upotrebljen"
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3028,24 +2985,24 @@ msgstr ""
 "dokumentaciju za strftime, za punu dokumentaciju: http://docs.python.org/lib/"
 "module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Karakteri koji će biti prikazani pre nadimka u razgovoru"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Karakteri koji će biti prikazani posle nadimka u razgovoru"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
 "kontakata"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3054,12 +3011,12 @@ msgstr ""
 "Koliko linija prethodnog razgovora pamtiti kada se prozor/jezičak  za "
 "razgovor ponovo otvori."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3068,19 +3025,19 @@ msgstr ""
 "Koliko sekundi čekati pre ponovnog automatskog pridruživanja sobi sa koje "
 "ste raskačeni. Staviti 0 da onemogućite ponovno automatsko pridruživanje."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Pošalji poruku sa Ctrl+Enter, a sa Enter pravi novu liniju. (Podrazumevano "
 "ponašanje Miralabisovog ICQ klijenta)"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Koliko linija sačuvati sa Ctrl+KeyUP"
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3089,11 +3046,11 @@ msgstr ""
 "Ili Vaš specificirani URL sa %s u njemu gde je %s reč ili fraza ili 'VIKI-"
 "REČNIK' što znači korišćenje viki-rečnika."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolisati korišćenjem gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3102,15 +3059,15 @@ msgstr ""
 "Ako se ne ispisuje vreme za svaku poruku (print_time==ponekad), ispisati ga "
 "svakih x minuta"
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3120,7 +3077,7 @@ msgstr ""
 "izgubiti podatke (ćaskanje, privatno ćaskanje, grupni razgovor koji neće "
 "biti minimizovan)"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3129,32 +3086,32 @@ msgstr ""
 "Lista hostova odvojena zarezima, koju šaljemo, uz lokalne interefejse, za "
 "transfer datoteka, u slučaju prosleđivanja porta/NATovanja."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definiše KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Obavesti me o svim događajima u ikoni sistemske kasete."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži jezičak iako je samo jedan razgovor?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaši granicu sveske u prozorima razgovora?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3163,7 +3120,7 @@ msgstr ""
 "Lista reči odvojena blanko karakterima koje će biti obojene u grupnim "
 "razgovorima"
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3173,22 +3130,13 @@ msgstr ""
 "Ako je istinito, Gajim se završava kada se pritisne X dugme. Ovo podešavanje "
 "se koristi samo ako je ikona sistemske kasete u upotrebi."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Ako je istinito, Gajim će prikazivati ikonu na svakom jezičku koji sadrži "
-"nepročitane poruke. U zavisnosti od teme, ikona može biti i animirana."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3197,14 +3145,14 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati statusnu poruku (ako nije prazna) za "
 "svaki kontakt u listi kontakata"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Definišite poziciju avatara u listi kontakata. Može biti levo ili desno"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3213,26 +3161,26 @@ msgstr ""
 "Ako je neistinito, više nećete videti statusnu porukuu razgovorima kada "
 "kontakt promeni svoj status i/ili statusnu poruku."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u sistemskoj kaseti."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3242,7 +3190,7 @@ msgstr ""
 "prozor bljeska (podrazumevano ponašanje u većini menadžera prozora) pri "
 "novim događajima."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3262,7 +3210,7 @@ msgstr ""
 "'pertype' - Poruke istog tipa (npr., razgovori i grupni razgovori) se šalju "
 "u isti prozor."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3270,32 +3218,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Ako nije istinito, nećete više videti avatar u prozoru razgovora."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Ako je istinito, pritisak na taster 'esc' zatvara jezičak/prozor."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Sakriva listu učesnika u prozoru grupnog razgovora"
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3304,18 +3252,18 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku novog reda samo kada se ne radi o "
 "istoj osobi koja je pričala i u prošloj poruci."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Uvlačenje pri korišćenju spajanja uzastopnih nadimaka."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl-Tab ide na sledeći jezičak kada nema nepročitanih jezičaka"
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3324,7 +3272,7 @@ msgstr ""
 "Treba li prikazivati dijalog za potvrdu blokiranja kontakta? Prazna nista "
 "znači da nikada ne prikazujemo dijalog."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3333,7 +3281,7 @@ msgstr ""
 "Treba li prikazivati dijalog za potvrdu blokiranja kontakta? Prazna nista "
 "znači da nikada ne prikazujemo dijalog."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3344,7 +3292,7 @@ msgstr ""
 "nalog u prozoru za izmenu podešavanja naloga. BUDITE OPREZNI, kada ste "
 "povezani sa negativnim prioritetom NEĆETE primati nikakve poruke od servera."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3353,7 +3301,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ukupan broj korisnika i broj korinsika "
 "na vezi u grupnim redovima."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3362,11 +3310,11 @@ msgstr ""
 "Ako je istinito, Gajim će skrolovati i označiti kontakt koji Vam je "
 "poslednji poslao poruku, ako prozor razgovora nije otvoren."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Vreme neaktivnosti posle koga se prozor za izmenu statusa zatvara."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3374,12 +3322,7 @@ msgstr ""
 "Maksimum poruka koje se prikazuju u razogovoru. Najstarije linije se "
 "sklanjaju."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-"Odaberite interval između dve provere da se ništa ne dešava na računaru."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3388,7 +3331,7 @@ msgstr ""
 "Ispravne uri šeme. Samo šeme sa ove liste će biti prihvaćene kao \"stvarne\" "
 "uri. (mailto i xmpp se obrađuju zasebno)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3396,51 +3339,51 @@ msgstr ""
 "Ako je True, dopunjavanje u grupnim razgovorima će biti kao dopunjavanje u "
 "konzoli"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3449,11 +3392,7 @@ msgstr ""
 "Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
 "podrazumevana poruka će biti korišćena."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3461,37 +3400,37 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3500,7 +3439,7 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3509,7 +3448,7 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3518,7 +3457,7 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3527,7 +3466,7 @@ msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3536,28 +3475,32 @@ msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Markiraj ovu sobu"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3566,7 +3509,7 @@ msgstr ""
 "Prioritet će se automatski promeniti u zavisnosti od Vašeg statusa. "
 "Prioriteti su definsani u autopriority_* podešavanjima."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3577,19 +3520,19 @@ msgstr ""
 "dnd, invisible. PAŽNJA: ova opcija se koristi samo ako je "
 "restore_last_status  onemogućena."
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Ako je omogućeno, postavi poslednji korišćeni status."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Ako je True, kontakti koji traže autorizaciju će automatski biti prihvaćeni."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3598,12 +3541,12 @@ msgstr ""
 "Ako je False, nalog će biti onemogućen i neće se prikazivati u listi "
 "kontakata."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Niste povezani na server"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3611,22 +3554,22 @@ msgid ""
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3635,7 +3578,7 @@ msgstr ""
 "Koliko sekundi čekati na odgovor o paketima o živosti pre nego što pokušamo "
 "ponovno uspostavljanje veze."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3644,20 +3587,20 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
 "difinisan u file_transfer_proxies podešavanjima za prenos."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
 "podrazumevana poruka će biti korišćena."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3665,17 +3608,17 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3684,28 +3627,24 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
 "difinisan u file_transfer_proxies podešavanjima za prenos."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "Greška SSL sertifikata"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3714,41 +3653,41 @@ msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Omogući ESessions enkripciju za ovaj nalog."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3757,91 +3696,91 @@ msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Jedem"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Radim."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Radim."
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Radim."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Napolju"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3851,1060 +3790,1060 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Za"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Grupni razgovori"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Poziv na grupni razgovor"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Poziv na grupni razgovor"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Grupni razgovor"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Grupni razgovori"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Novi grupni razgovor"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Usluga ne može biti nađena"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Ovo nije grupni razgovor"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Račun lokal već postoji."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Grupni razgovori"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Obavlja rutinu"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Kupuje namirnice"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Čisti"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Kuva"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Obavlja održavanje"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Pere sudove"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Pere veš"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Baštovani"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Na zadatku"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Šeta psa"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Pije"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Pije pivo"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Pije kafu"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Pije čaj"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Užina"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Doručkuje"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Ruča"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Večera"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Vežba"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Vozi biciklu"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Pleše"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Šeta"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Džogira"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Bavi se sportom"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Trči"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Skija"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Pliva"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Vežba"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Češlja se"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "U banji"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Pere zube"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Šiša se"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Brije se"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Kupa se"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Tušira se"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Sastanči"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Slobodan dan"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Bleji"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Krije se"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "Na odmoru"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Moli se"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Zakazani odmor"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Razmišlja"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Odmara se"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Peca"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Igra igrice"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Izlazi napolje"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Na provodu"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Čita"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Uvežbava"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "U šopingu"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Puši"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Druži se"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Sunča se"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Gleda TV"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Gleda film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Priča"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "U stvarnom životu"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Telefonira"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Na video telefonu"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Putuje"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Muva se"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Vozi"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "U kolima"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "U autobusu"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "U avionu"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "U vozu"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "Na putu"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Šeta"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programira"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "Na sastanku"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Uči"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Piše"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Uplašen"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Oduševljen"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Zaljubljen"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Ljut"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Iznerviran"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Anksiozan"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Napaljen"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Smoren"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Hrabar"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Miran"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Oprezan"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Smrznut"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Pouzdan"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Zadubljen u misli"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Na kraju živaca"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Lud"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Kreativan"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Zainteresovan"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Potišten"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Skrhan"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Ometen"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Zavidljiv"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Za flertovanje"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Zahvalan"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "U patnji"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Mrgudan"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Kriv"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Srećan"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "U nadanju"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Naložen"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Skroman"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Gladan"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Povređen"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Očaran"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Ozlojeđen"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Zainteresovan"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Otrovan"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Nepobediv"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Izgubljen"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Srećan"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Zloban"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Raspoložen"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervozan"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Uvređen"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Pobesneo"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Igrao bi se"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Ponosan"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Opušten"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Olakšan"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Samilostan"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Neumoran"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Tužan"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarkastičan"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Zadovoljan"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Stidljiv"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Bolestan"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Pod stresom"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Jak"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Zahvalan"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Umoran"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Nedefinisan"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Slab"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "podrazumevano"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "morska"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Krije se"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Nalog"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Nalog"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Opis"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Greška"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "jedan"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "soba"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Nisam uspeo da uzmem CRL sertifikata"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nisam uspeo da dešifrujem potpis sertifikata"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nisam uspeo da dešifrujem CRL sertifikata"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Nisam uspeo da dekodiram javni ključ izdavača"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu sertifikata"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Greška u CRL sertifikata"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Sertifikat još nije validan"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "CRL nije još validan"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Greška u formatu sertifakovog polja od kada je validan"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Greška u formatu sertifakovog polja do kada je validan"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja poslednjeg ažuriranja"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja sledećeg ažuriranja"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Nemam više memorije"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Samopotpisani sertifikat u lancu sertifikata"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "U nemogućnosti da uzmem sertifikat lokalnog izdavača"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "U nemogućnosti da verifikujem prvi sertifikat"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Lanac sertifikata predugačak"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Sertifikat povučen"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Neispravan sertifikat sertifikacionog tela (CA)"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Prekoračena dužina putanje"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha sertifikata"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Sertifikatu se ne veruje"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Sertifikat odbačen"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Pogrešna tema izdavača sertifikata"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Identifikator ključa autorizatora i teme se ne poklapaju"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Serijski broj autorizatora i izdavača se ne poklapaju"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Sertifikat povučen"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Autorizacija prihvaćena"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Smajliji isključeni"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Sertifikat je istekao"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Zahtev za pretplatom"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Ekstenzija nije podržana"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Prijavljivanje sa \"%s\" neuspešno"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4966,12 +4905,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Konfiguracija sobe"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4983,222 +4922,192 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Neispravan karakter u imenu hosta."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Potrebna je adresa servera."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Neispravan karakter u korisničkom imenu."
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Neispravan karakter u resursu."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Zauzet"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Odsutan"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Za"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Oboje"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Nepoznat"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Učesnici"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Učesnik"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Vlasnik"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Član"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Član"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piše poruku..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5206,22 +5115,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "u _grupnim razgovorima"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od korisnika %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5229,50 +5138,39 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaj na čekanju"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Želio bih da Vas dodam na listu mojih kontakata."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nije još validan"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka, ali bi trebala biti fascikla"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim će se sada završiti"
 
@@ -5376,83 +5274,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Želeo bih da te dodam na moju listu kontakata."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E enkripcija onemogućena"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Izmeni statusne informacije"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Izmeni status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Postavi tip prisutnosti i opis"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Na vezi"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Duže odsutan"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Ne smetaj"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Nije na vezi"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Opis prisutnosti:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Status se promenio."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Poslati kontakti: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Poslati kontakti:"
 
@@ -5475,7 +5373,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Nalog"
 
@@ -5486,7 +5384,7 @@ msgstr "Grupni razgovori"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Lozinka:"
@@ -5510,7 +5408,7 @@ msgstr "u _grupnim razgovorima"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Pridruži se"
@@ -5528,17 +5426,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Odustani"
 
@@ -5686,7 +5584,7 @@ msgstr "Informacije kontakta"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Opis"
 
@@ -5891,39 +5789,44 @@ msgstr "Posao"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "O"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Vraćam se brzo"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Uklanjanje računa %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5992,6 +5895,7 @@ msgid "Strike"
 msgstr "Precrtano"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Boja"
 
@@ -6004,139 +5908,134 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Očisti formatiranje"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Odaberite datoteku za slanje..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Prikaži listu smajlija (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Zabrana..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Promeni _nadimak..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Promeni _temu..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Unesite novu lozinku:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Napusti grupne razgovore"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Dogodila se greška:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Potvrdite ponovo..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Učesnik"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Izbaci"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Učesnik"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Novi grupni razgovor"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Uništavam %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Razlog"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Unesite novo ime za grupu %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Pozo_vi"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "događaj"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "događaj"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6234,20 +6133,20 @@ msgid "Add"
 msgstr "Dodate"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Ukloni"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Resurs:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6257,7 +6156,7 @@ msgid "Client"
 msgstr "<b>Klijent:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Sistem:</b>"
@@ -6402,38 +6301,39 @@ msgstr "Ponašanje prozora:"
 msgid "_Show contact list on startup"
 msgstr "_Prikaži listu kontakata"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "_Spoji naloge"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Prikaži _avatare kontakata na listi"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6442,12 +6342,12 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Prikaži statusne poruke kontakata na listi"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6456,53 +6356,53 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Prikaži _raspoloženja kontakata na listi"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Sortiraj kontakte po statusu"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Poslati kontakti:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Razmena stavki kontakata"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Provera pravopisa"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6515,29 +6415,29 @@ msgstr ""
 "polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
 "grupni razgovor."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "sadržaj poruke"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Prikaži listu formatiranja"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Prikaži statusne poruke kontakata na listi"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6546,58 +6446,58 @@ msgstr ""
 "Ako je neistinito, više nećete videti statusnu porukuu razgovorima kada "
 "kontakt promeni svoj status i/ili statusnu poruku."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Registracija neuspela"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6606,116 +6506,119 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Poslednji status: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Razgovori"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Notification-daemon"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Kada se primi novi događaj:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Omogući iskačuće prozore/obaveštenja kada sam _odsutan/nedostupan/zaposlen/"
 "nevidljiv"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Omogući iskačuće prozore/obaveštenja kada sam _odsutan/nedostupan/zaposlen/"
 "nevidljiv"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavesti me o kontaktima koji se _prijave"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavesti me o kontaktima koji se _odjave"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Vizualna obaveštenja</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Puštaj zvukove"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Pode_si..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Doz_voli zvukove kada sam zauzet"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav Zvukovi"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Obaveštenja"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Nedostupan"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6724,7 +6627,7 @@ msgstr ""
 "Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
 "duže nije u upotrebi"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6733,7 +6636,7 @@ msgstr ""
 "Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
 "duže nije u upotrebi"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6746,7 +6649,7 @@ msgstr ""
 "$S će biti zamenjeno prethodnom statusnom porukom\n"
 "$T će biti zamenjeno sa vremenom odsutnosti"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6759,40 +6662,40 @@ msgstr ""
 "$S će biti zamenjeno prethodnom statusnom porukom\n"
 "$T će biti zamenjeno sa vremenom nedostupnosti"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minuta"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatski status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Pitaj za statusnu poruku pri:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Prijavljivanju"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Odjavljivanju"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6800,68 +6703,68 @@ msgstr ""
 "Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
 "podrazumevana poruka će biti korišćena."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Podrazumevana poruka"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Statusna poruka"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Već postavljene statusne poruke</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Konfigurisanje boje i fonta interfejsa"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Skup statusnih ikona:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Koristi ikone za _transporte"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6870,117 +6773,127 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
 "(npr. kontakt sa MSN-a će imati msn ikone za svoje statuse)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Stil"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Mogućnosti"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Podrazumevana poruka"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Privatni Razgovori"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Veza"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Server:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Podesi..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj nalog"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Ostalo</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Napredna izmena konfiguracije"
@@ -7164,12 +7077,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Unesite novu lozinku:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Napredne Akcije"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Koristi Vaše određeno ime hosta/port "
@@ -7255,7 +7168,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Prijavljivanju"
@@ -7269,7 +7182,7 @@ msgstr "Molimo Vas napravite novu čistu temu sa željenim imenom."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7299,8 +7212,8 @@ msgstr "_Ponovo učitaj podrazumevane boje"
 msgid "Resets value to default"
 msgstr "_Ponovo učitaj podrazumevane boje"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Ime hosta:"
@@ -7344,7 +7257,7 @@ msgstr "Samopotpisani sertifikat"
 msgid "Proxy Host"
 msgstr "Proksi _host:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Tip"
 
@@ -7358,8 +7271,7 @@ msgstr "_Protokol:"
 msgid "Copy info to clipboard"
 msgstr "_Kopiraj lokaciju veze"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Mogućnosti"
 
@@ -7546,6 +7458,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Izmeni statusnu poruku"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
@@ -7622,8 +7539,8 @@ msgstr "Zastoj"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7812,80 +7729,106 @@ msgstr "Registracija neuspela"
 msgid "_Name"
 msgstr "_Ime:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proksi:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Započni razgovor"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Napusti grupne razgovore"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Upravnik istorijatom"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Registracija neuspela"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Podešavanja"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "_Izlaz"
+msgid "_Accounts"
+msgstr "Nalozi"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Prikaz"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Prikaži samo _aktivne kontakte"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Prikaži kontakte koji nisu na vezi"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Prikaži samo _aktivne kontakte"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Prikaži trans_porte"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML Konzola"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Prenosi datoteka"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Pomoć"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Na vezi"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Na vezi"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Mogućnosti"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "O"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7900,6 +7843,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Napusti grupne razgovore"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8186,60 +8134,68 @@ msgstr "Razmena stavki kontakata"
 msgid "Create new group chat"
 msgstr "Napusti grupne razgovore"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Podešavanja"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Prenosi datoteka"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "statusna poruka"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Prikaži _XML Konzolu"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Izgled razgovora</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Prikaži kontakte koji nisu na vezi"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Prikaži samo _aktivne kontakte"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Prikaži samo _aktivne kontakte"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Informacije kontakta"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Preimenuj kontakt"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Poslati kontakti:"
@@ -8316,12 +8272,16 @@ msgstr "Popunite formular."
 msgid "Group Chat Configuration"
 msgstr "Poziv na grupni razgovor"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML Konzola"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Započni razgovor"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
@@ -8367,11 +8327,6 @@ msgstr "Prikaži sv_e događaje na čekanju"
 msgid "Mute Sounds"
 msgstr "Ugasi zvukove"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Podešavanja"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8691,124 +8646,124 @@ msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Grupni razgovori"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Grupni razgovori"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Ovaj grupni razgovor nema temu"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Grupni razgovori"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Grupni razgovori"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Grupni razgovori"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Poziv na grupni razgovor"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Sesija NEĆE biti pamćena"
@@ -8837,7 +8792,7 @@ msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Primaoc: "
 
@@ -8989,7 +8944,7 @@ msgstr "Datoteka: "
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
@@ -9004,7 +8959,7 @@ msgid "Change"
 msgstr "Promeni _nadimak..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Vraćam se brzo"
@@ -9035,11 +8990,12 @@ msgid "Password Change Failed"
 msgstr "Lozinka zahtevana"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Pojavila se greška pri kreiranju naloga"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Izmeni lozinku"
 
@@ -9077,40 +9033,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Nastavljeni razgovor"
+msgid "Start / Join Chat"
+msgstr "Započni razgovor"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Dodaj kontakt..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s nije pronađen"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis još nije pružio detaljne informacije"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9119,33 +9070,33 @@ msgstr ""
 "Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
 "Najverovatnije je zastareo ili u kvaru"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Ostali"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Grupni razgovori"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9153,142 +9104,142 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Ovaj tip usluge ne sadrži elemente za pretragu"
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Neispravano ime servera"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Pregled"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Pretraga"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Izmeni"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Korisnici"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Identifikacija"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Čvor"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Nova objava"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "tema"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Karakter nije dozvoljen"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Nije moguće poslati poruku za %s, ovaj džaber ID nije ispravan."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
@@ -9334,93 +9285,75 @@ msgstr "Registracija uspešna"
 msgid "Registration failed"
 msgstr "Registracija neuspela"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Rečnik za jezik %s nije dostupan"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
-"ili odaberite drugi jezik postavkom speller_language opcije.\n"
-"\n"
-"Osvetljavanje loše napisanih reči neće biti u upotrebi"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "za nalog %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Broj:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Poziv na grupni razgovor"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
@@ -9435,6 +9368,11 @@ msgstr "GG Broj:"
 msgid "ICQ Number"
 msgstr "ICQ Broj:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Dodaj kontakt..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9490,7 +9428,7 @@ msgstr "Greška prilikom dodavanja servisa. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9652,43 +9590,63 @@ msgstr "Kontakt Otišao Sa Veze"
 msgid "Contact Connected Background "
 msgstr "Kontakt Na Vezi"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Statusna poruka"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Statusna poruka"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Statusna poruka"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Statusna poruka"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Neispravan nadimak"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Karakter nije dozvoljen"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Da li zaista želite da izbrišete označenu poruku?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Ovo ime se već koristi. Da li želite da prepišete ovu statusnu poruku?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktivno"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Registracija neuspela"
@@ -9712,10 +9670,9 @@ msgid "Error: %s"
 msgstr "Greška: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Greška"
 
@@ -9729,48 +9686,48 @@ msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Čisti"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Podešavanje proksi profila"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proksi:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Podesi prema statusu"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Nije na vezi"
@@ -9791,7 +9748,7 @@ msgstr "Nalog"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Vaš novi nalog je uspešno napravljen"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9823,60 +9780,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Sinhronizuj"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Šta želite da uradite?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Povezivanje"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Prosledi nepročitane poruke"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "GTK+ Džaber klijent"
@@ -9935,127 +9897,127 @@ msgstr "Zahvalan"
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Odaberite datoteku za slanje..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Odaberite sliku"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Sve datoteke"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Sve datoteke"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Pošalji _datoteku"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Slike"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Odaberite sliku"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Sve datoteke"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Snimi datoteku kao..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Na vezi"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Van veze"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Ime datoteke: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Skidanje"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Slanje"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Prenos datoteke zaustavljen"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Opis:"
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?status prenosa:Pauziran"
@@ -10064,7 +10026,7 @@ msgstr "?status prenosa:Pauziran"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Neispravna datoteka"
@@ -10120,26 +10082,26 @@ msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Lozinka zahtevana"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Ništa"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Odustani"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10158,11 +10120,6 @@ msgstr "koristeći račun %s"
 msgid "Hide _Contact List"
 msgstr "Pozovi kontakte"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Prikaži samo _aktivne kontakte"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
@@ -10212,36 +10169,31 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Podešavanja"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Podešavanja"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Niste povezani na server"
+msgid "Archiving Preferences Error"
+msgstr "_Podešavanja"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Greška u primanju forme za podatke"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Podešavanja"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktivirano"
@@ -10290,59 +10242,59 @@ msgstr "?Pitaj (za pretplatu):Nijedna"
 msgid "?password:Hidden"
 msgstr "Lozinka:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Podešavanja"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10351,121 +10303,121 @@ msgstr ""
 "Daje mogućnost merenja vremena kada se ništa ne dešava, da se odredi auto "
 "status."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Zahteva libxss biblioteku."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr "Razgovor bez servera sa autodetekcijom klijenata u lokalnoj mreži."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Zahteva python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Zahteva gpg i python-GnuPGInterface."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Veza"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Zahteva libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Obaveštenja"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Zahteva python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Sačuvaj lozinku"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Lozinke se mogu sačuvati i pouzdanije od običnog teksta."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Zahteva gnome-keyring and python-gnome2-desktop, ili kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Provera pravopisa"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Zahteva libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Zahteva python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Podešavanja"
@@ -10512,7 +10464,7 @@ msgstr "Neispravno ime liste"
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Pozovi kontakte"
@@ -10540,7 +10492,7 @@ msgstr "_Završi"
 msgid "Commands"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10613,118 +10565,132 @@ msgstr "Zahtev pretplate od %s"
 msgid "Loading"
 msgstr "Programira"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Na vezi"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Uklanjanje računa %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Kliknite za izmenu lozinke Vašeg naloga"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Povezivanje"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Vaš server ne podržava Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Karakter nije dozvoljen"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Vaš server ne podržava Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Veza prekinuta"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Napravi novu objavu"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Vaš port mora biti broj porta."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Napredne Akcije"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Zabranjujem %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Uklanjanje računa %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registruj se na %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Nalog"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Nalozi"
@@ -10767,252 +10733,256 @@ msgstr "Pretraga"
 msgid "No results found"
 msgstr "Nema rezultata"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Ako želite da se sve promene trenutno primene, morate da se ponovo povežete."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Neispravan nalog"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Neispravan nalog"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Pozovi kontakte"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Samopotpisani sertifikat"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Po_veži se prilikom pokretanja Gajima"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Snimi dnevnik razgovora za sve kontakte"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Svi statusi"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Menja status jednog ili više naloga"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Koristi proksi za prenos datoteka"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " od %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Pozovi kontakte"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tet"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "koristi HTTP_PROXY promenljiv_u okruženja"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Menja status jednog ili više naloga"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Ime:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Prezime:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Novi E-mejl"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Podesi prema statusu"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Omogući"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Veza"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Samopotpisani sertifikat"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Sačuvaj lozinku"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registracija neuspela"
@@ -11065,19 +11035,19 @@ msgstr[0] "Uklanja kontakt sa liste"
 msgstr[1] "Uklanja kontakt sa liste"
 msgstr[2] "Uklanja kontakt sa liste"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Nepoznat izvođač"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Nepoznat izvor"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11091,22 +11061,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Markiraj ovu so_bu"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Datoteka je prazna"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Servis je poslao loše podatke"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11163,127 +11133,240 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Prikaži sv_e događaje na čekanju"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Mogućnosti"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Provera pravopisa sastavljenih poruka."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontakti"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Grupni razgovori"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Nedavno:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Registracija neuspela"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Nastavljeni razgovor"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Nepoznata SSL greška: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr ""
+#~ "Odaberite interval između dve provere da se ništa ne dešava na računaru."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Rečnik za jezik %s nije dostupan"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Morate instalirati %s rečnik kako biste mogli koristiti proveru "
+#~ "pravopisa, ili odaberite drugi jezik postavkom speller_language opcije.\n"
+#~ "\n"
+#~ "Osvetljavanje loše napisanih reči neće biti u upotrebi"
+
+#~ msgid "_Reconnect"
+#~ msgstr "U_loguj se ponovo"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "_Izlaz"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Prikaži samo _aktivne kontakte"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Dodaj kontakt..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Pozovi kontakte"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Napusti grupne razgovore"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Novi grupni razgovor"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Ako je istinito, Gajim će prikazivati ikonu na svakom jezičku koji sadrži "
+#~ "nepročitane poruke. U zavisnosti od teme, ikona može biti i animirana."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Neispravan karakter u imenu hosta."
+
+#~ msgid "Server address required."
+#~ msgstr "Potrebna je adresa servera."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Neispravan karakter u korisničkom imenu."
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Neispravan karakter u resursu."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Obavesti me o kontaktima koji se _prijave"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Obavesti me o kontaktima koji se _odjave"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Obavesti me kada se završi prenos datoteke"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Obavesti me kada se završi prenos datoteke"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Boja pozadine kontakta kada tek dođu na vezu."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "događaj"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "događaj"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Niste povezani na server"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Konflikt resursa"
 
@@ -11916,9 +11999,6 @@ msgstr "Registracija neuspela"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Pošalji privatnu poruku"
 
-#~ msgid "Send _File"
-#~ msgstr "Pošalji _datoteku"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Učesnici"
@@ -14129,10 +14209,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Zastoj"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Registracija neuspela"
-
 #~ msgid "cyan"
 #~ msgstr "cijan"
 
@@ -14642,9 +14718,6 @@ msgstr "Registracija neuspela"
 #~ "neodgovarajući za Vaša podešavanja, ovde možete odabrati neki drugi.\n"
 #~ "Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "_Spoji naloge"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP nije moguće koristiti na ovom računaru"
 
@@ -15124,9 +15197,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Zahteva python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Zahteva gnome-keyring and python-gnome2-desktop, ili kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/sv.po b/po/sv.po
index 1874b1374..967c1ca0d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2009-10-29 10:21+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -19,71 +19,77 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Konton"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "och autentiserad"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "och INTE autentiserad"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din chattsession %(logged)s att loggas."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Välj Bild"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Du är på väg att stänga flera flikar"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Är du säker på att du vill lämna gruppchatten \"%s\"?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Integritetslista"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "Bannlyser %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
@@ -91,7 +97,7 @@ msgstr ""
 "Om du skickar en fil till %s så kommer han/hon att få veta ditt riktiga "
 "Jabber-ID."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Fortsätt"
 
@@ -157,502 +163,497 @@ msgstr "Det finns inga väntande prenumerationsbegäran."
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Visa frånkopplade _kontakter"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Skicka ett _meddelande"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Kör kommando"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Hantera transport"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "Byt _namn"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "A_vblockera"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blockera"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Ta _bort"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "Skicka _fil"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Spara fil som..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Spara fil som..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Senaste status: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Bjud in _kontakter"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "_Lägg till kontakt..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Förfrågan om Filöverföring"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Privat Chatt"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Historik"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Composing only"
+msgid "Composing Only"
 msgstr "Skriver"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "All chat states"
+msgid "All Chat States"
 msgstr "Alla statusar"
 
-#: gajim/gui_menu_builder.py:575
-#, fuzzy
-msgid "Invite Contact"
-msgstr "Bjud in _kontakter"
-
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Lämna gruppchattar"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Lämna gruppchattar"
+msgid "Rename…"
+msgstr "Byt _namn"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Byt _ämne..."
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Lämna gruppchattar"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Välj Bild"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Ny gruppchatt"
+msgid "Configure…"
+msgstr "_Konfigurera"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Förstör %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registreringen misslyckades"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Logga statusändringar för kontakter"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Förvalda meddelanden:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Minimera vid stängning"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Minimera när du gått in automatiskt"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Byt smek_namn..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Röst"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "_Kör kommando"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dagar sen"
 msgstr[1] "%i dagar sen"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+#, fuzzy
+msgid "Composing only"
+msgstr "Skriver"
+
+#: gajim/gui_menu_builder.py:651
+#, fuzzy
+msgid "All chat states"
+msgstr "Alla statusar"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Lägg till kontakt..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "fil"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Skicka ett _meddelande"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "_Upptäck tjänster"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Inställningar"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Bannlista"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Bokmärk"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Rumkonfiguration"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Synkronisera"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Skicka servermeddelande..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Ange MOTD..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Uppdatera MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Ta bort MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Lägg till kontakt..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Redigera konto"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Redigera konto"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Konton"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Kopiera JID/e-postadress"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Gå in i gruppchatt"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "_Lägg till kontakt..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiera länkplats"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiera JID/e-postadress"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Skriv e-post"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiera länkplats"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Notifiering"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Kopiera JID/e-postadress"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Bjud _in"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "A_vblockera"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Blockera"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "Sparka _ut"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Bannlys"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Ägare"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Medlem"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Medlem"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Röst"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Rummets JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "meddelande"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "_Känsloikoner:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Filen finns inte"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM-adress:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -660,29 +661,29 @@ msgstr "Datum"
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Meddelande"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Ämne"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Databasfel"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "skapar loggdatabas"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -695,281 +696,286 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänta..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Rensa _upp"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Du"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Ta bort"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Avbryt bekräftelse"
 msgstr[1] "Avbryt bekräftelse"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort det valda meddelandet?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Standardmeddelande"
 msgstr[1] "Standardmeddelande"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort det valda meddelandena?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Allmänt"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grupp"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "I gruppen"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Ange humör"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Ingen"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Skriv över statusmeddelande?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "Detta namn används redan. Vill du skriva över detta statusmeddelande?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Statusmeddelande"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Spara som förval..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Ange ett namn för detta statusmeddelande"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Har "
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Status"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Namn"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Detta konto är inte anslutet till servern"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan inte synkronisera med ett konto utan att vara ansluten."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "Skicka _fil"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Spara fil som..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Filöverföringar"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Ogiltig Fil"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Sparkar %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Bannlista"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s har ställt in ämnet till %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Rummet visar nu otillgängliga medlemmar"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "rummet visar nu inga otillgängliga medlemmar"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Sessionen KOMMER INTE att loggas"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Information om dig, som den är sparad på servern"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Rummet är nu icke-anonymt"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Rummet är nu semi-anonymt"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Rummet är nu fullständigt anonymt"
@@ -984,7 +990,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Fel."
 
@@ -1012,22 +1018,22 @@ msgstr "Ett nytt rum har skapats"
 msgid "Failed to Configure Group Chat"
 msgstr "Lämna gruppchattar"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s är nu känd som %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Du är nu känd som %s"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s är nu %(status)s"
@@ -1154,81 +1160,81 @@ msgid "If you close this window, you will leave '%s'."
 msgstr ""
 "Om du stänger det här fönstret kommer du bli frånkopplad från det här rummet."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Visa en lista över formateringar"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Denna kontakt har inte stöd för filöverföringar."
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s från gruppchatten %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Ignorera detta fel med certifikatet."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Du tog just emot ett meddelande från \"%s\""
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Skicka och stäng"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Skicka och stäng"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1237,189 +1243,180 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s är nu %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Filöverföringar"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "Storlek: "
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Acceptera"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Frånkopplad"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Öppna mapp"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Fjärrkontakten stoppade överföringen"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Fel vid öppnande av filen"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Filöverföringen stoppad"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Filöverföringen avbruten"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Anslutning med motpart kan inte etableras."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Visa enbart i _registret"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avancerad konfigurationsredigerare"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rumkonfiguration"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Visa alla väntande _händelser"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Starta Chatt"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Gruppchattar"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Auktorisering har sänts"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Om \"%s\" accepterar din förfrågan kommer du att känna till hans eller "
 "hennes status."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Auktorisering har tagits bort"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
@@ -1429,7 +1426,7 @@ msgstr "Nu kommer \"%s\" alltid se dig som offline."
 msgid "desynced"
 msgstr "inte i synk"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1449,7 +1446,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Stäng alltid Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "A_vsluta"
@@ -1600,8 +1598,8 @@ msgstr "Byt namn på grupp"
 msgid "Please enter a new name"
 msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Byt _namn"
@@ -1620,28 +1618,33 @@ msgstr "Vill du ta bort gruppen %s från kontaktlistan?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Ta även bort alla kontakter i denna grupp från din kontaktlista"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Lämna gruppchattar"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Ange ett nytt användarnamn för ditt lokala konto"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Byt namn på kontakt"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr ""
 "Du är på väg att ta bort \"%(name)s\" (%(jid)s) från din kontaktlista.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1651,23 +1654,23 @@ msgstr ""
 "så kommer du även ta bort behörigheten vilket resulterar i att kontakten "
 "kommer alltid se dig som frånkopplad."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr ""
 "Jag vill att denna kontakten skall känna till min status även efter "
 "borttagningen"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1679,24 +1682,24 @@ msgstr ""
 "så kommer du även ta bort behörigheten vilket resulterar i att kontakten "
 "kommer alltid se dig som frånkopplad."
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Byt namn på kontakt"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1705,13 +1708,13 @@ msgstr ""
 "Din server saknar stöd för att lagra information om metakontakter. Denna "
 "information kommer därför inte att sparas vid nästa återanslutning."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1722,124 +1725,124 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Byt namn på kontakt"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativ"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Vill du skicka denna fil till %s:"
 msgstr[1] "Vill du skicka dessa filer till %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Skicka"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Skicka %s till %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Gör %s till en metakontakt för %s"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicera låt"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Bjud _in till"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Redigera _grupper"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "Ta _bort"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Byt _namn"
 
-#: gajim/roster_window.py:5132
+#: gajim/roster_window.py:5116
 #, fuzzy
-msgid "_Reconnect"
-msgstr "_Koppla från"
+msgid "Execute command"
+msgstr "_Kör kommando"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Historik"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observerande"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1969,70 +1972,70 @@ msgstr "Privat Chatt"
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s)-auktorisering för %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Accepterar du den här begäran på kontot %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Auktorisering har sänts"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Auktorisering har sänts"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ingen"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Anslutningsfel"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fel vid sändning av %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Prenumerationsbegäran"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Prenumerationsbegäran"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2041,152 +2044,152 @@ msgstr ""
 "Du kommer alltid att se honom eller henne som frånkopplad.\n"
 "Vill du ta bort honom eller henne från din kontaktlista?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Säg _upp prenumeration"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikatet har gått ut"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 "Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Fjärrkontakten stoppade överföringen"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Fel vid öppnande av filen"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL-certifikatfel"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Filöverföringar"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Ange ett nytt användarnamn för ditt lokala konto"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Osäker anslutning"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2197,20 +2200,20 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Ansluter"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2415,11 +2418,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "publicering av vCard misslyckades"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2754,78 +2757,73 @@ msgstr ""
 "Argumentet \"%(arg)s\" är inte angivet. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer info"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s är en katalog men den borde vara en fil"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Förstör %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Okänt SSL-fel: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "Nytt meddelande från %(nickname)s"
 msgstr[1] "Nytt meddelande från %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Ny gruppchatt"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ändrade status"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s är nu %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Kontakten ändrade status"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s loggade in"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Kontakten loggade in"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s loggade ut"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentisering mot \"%s\" misslyckades"
@@ -2892,63 +2890,21 @@ msgid ""
 msgstr ""
 
 #: gajim/common/config.py:93
-#, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Notifiera mig om kontakter som loggar _in"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Notifiera mig om kontakter som loggar _ut"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Chattstatusmeddelanden:"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Meddela mig när en filöverföring är färdig"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Meddela mig när en filöverföring är färdig"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Bakgrundsfärg på kontakter när de precis loggat in."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "standard"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Språk som används för stavningskontroll"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2958,15 +2914,15 @@ msgstr ""
 "\"ibland\" - skriv ut tid var print_ichat_every_foo_minutes minut.\n"
 "\"aldrig\" - skriv aldrig ut tid."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandla par av * / _ som möjliga formateringstecken."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2975,7 +2931,7 @@ msgstr ""
 "Om sant så tas inte */_ bort. Så *abc* blir i fet stil men * * / / _ _ tas "
 "inte bort."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -2984,7 +2940,7 @@ msgstr ""
 "Tecken att lägga till efter smeknamnet när smeknamnskomplettering används "
 "(tabb) i gruppchatt."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -2993,17 +2949,17 @@ msgstr ""
 "Tecken att föreslå för att läggas till efter önskat smeknamn när önskat "
 "smeknamn används av någon annan i gruppchatten."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3016,24 +2972,24 @@ msgstr ""
 "\". Läs python-manualen för strftime för fullständig dokumentation: http://"
 "docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Tecken som skrivs ut före smeknamnet i konversationer"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Tecken som skrivs ut efter smeknamnet i konversationer"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3042,30 +2998,30 @@ msgstr ""
 "Hur många rader som skall kommas ihåg från tidigare konversation när en "
 "chattflik/chattfönster öppnas igen."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Skicka meddelande med Ctrl+Enter och gör radbrytning med Enter (ICQ-klienten "
 "Mirabilis standardbeteende)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3074,31 +3030,31 @@ msgstr ""
 "Antingen en anpassad url med %s, där %s är ordet/frasen eller \"WIKTIONARY\" "
 "vilket betyder att wiktionary skall användas."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Om kryssad så kan Gajim fjärrstyras med gajim-remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3107,41 +3063,41 @@ msgstr ""
 "Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
 "port forwarding."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-standarden säger: KiB = 1024 byte, KB = 1000 byte."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifiera om händelser in systemets statusikon."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Visa flik när endast en konversation är aktiv?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Visa flikkant om endast en konversation är aktiv?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Visa stängningsknapp i flik?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Chattstatusmeddelanden:"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
 msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3151,22 +3107,13 @@ msgstr ""
 "Om sant så avslutas Gajim när fönsterhanterarens X-knapp klickas. Denna "
 "inställning behandlas endast när aktivitetsfältsikonen används."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Om sant kommer Gajim att visa en ikon på varje flik som innehåller olästa "
-"meddelanden. Beroende på temat så kan denna ikon vara animerad."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3175,12 +3122,12 @@ msgstr ""
 "Om True kommer Gajim att visa statusmeddelande, om inte tomt, för varje "
 "kontakt under dess namn i registerfönstret"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3189,26 +3136,26 @@ msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Visa inte kontaktlista i systemets fönsterlista."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3218,7 +3165,7 @@ msgstr ""
 "fönstret att blinka (standardbeteendet i de flesta fönsterhanterare) när det "
 "finns väntande händelser."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3238,7 +3185,7 @@ msgstr ""
 "visas i ett specifikt fönster. OBS: Gajim måste startas om för att denna "
 "inställning skall börja gälla."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3246,32 +3193,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Om True kommer escape att stänga en tabb eller ett fönster"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Döljer bannern i ett gruppchattfönster"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Döljer bannern i ett gruppchattfönster"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Döljer deltagarlistan i gruppchattfönster."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3280,163 +3227,155 @@ msgstr ""
 "Visa endast smeknamnet, i en chatt, vid början av en rad om det inte är "
 "samma person som pratar som i förra meddelandet."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "Ctrl+Tabb går till nästa skrivflik när ingen är oläst."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3445,7 +3384,7 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3454,7 +3393,7 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3463,75 +3402,79 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Bokmärk detta rum (Ctrl+B)"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr "Prioritet kommer att ändras automatiskt beroende på din status."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3539,28 +3482,28 @@ msgid ""
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3569,17 +3512,17 @@ msgstr ""
 "Om kryssad så kommer Gajim att använda ditt IP och proxyservrar definerade i "
 "alternativet file_transfer_proxies för filöverföringar."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3587,17 +3530,17 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3606,158 +3549,154 @@ msgstr ""
 "Om kryssad så kommer Gajim att använda ditt IP och proxyservrar definerade i "
 "alternativet file_transfer_proxies för filöverföringar."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "SSL-certifikatfel"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Aktivera ESessions-kryptering för detta konto."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Äter"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Jag arbetar."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Arbetar"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Ute"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3766,1063 +3705,1063 @@ msgstr ""
 "Ljud att spela när MUC-meddelande innehåller ett av orden i "
 "muc_highlight_words, eller när MUC-meddelande innehåller ditt smeknamn."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Ljud att spela upp när ett MUC-meddelande anländer."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Till"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Gruppchattar"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Gruppchatt"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Gruppchattar"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Möjligheten att skapa rum är begränsad."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Ny gruppchatt"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "Det här är ingen gruppchatt"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Kontot Local används redan."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "Gruppchatten %s finns inte."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Gruppchattar"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Fel Lösenfras"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Handlar mat"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Städar"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Lagar mat"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Reparerar"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Diskar"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Tvättar"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Arbetar i trädgården"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "Springer ett ärende"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Ute och går med hunden"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Dricker"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Tar en öl"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "Dricker kaffe"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Dricker te"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Tar ett mellanmål"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Äter frukost"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Äter middag"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Äter lunch"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Tränar"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Cyklar"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Dansar"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 #, fuzzy
 msgid "Hiking"
 msgstr "Sparkar %s"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Joggar"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Sportar"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Springer"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Åker skidor"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Simmar"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Tränar"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Grooming"
 msgstr "Från"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "Njuter på ett spa"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Borstar tänderna"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Är hos frissan"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Rakar sig"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Tar ett bad"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Tar en dusch"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "I ett möte"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Har en ledig dag"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Hänger"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Gömmer sig"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "På semester"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Ber"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Planerad ledighet"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Tänker"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Slappar"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Fiskar"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Spelar"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Går ut"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Festar"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Läser"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Pluggar"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Handlar"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Röker"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Minglar"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Solar"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Ser på tv"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Ser en film"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Pratar"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "I verkliga livet"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Pratar i telefon"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "I ett videosamtal"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Reser"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Pendlar"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Kör bil"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "I en bil"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "På en buss"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "På ett flygplan"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "På ett tåg"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "På resa"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Promenerar"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Programmerar"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "I ett möte"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Studerar"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Skriver"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Rädd"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Förvånad"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Kärleksfull"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Arg"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Irriterad"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Ängslig"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Intresserad"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Skamsen"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Uttråkad"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Modig"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Lugn"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Försiktig"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Kall"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Självsäker"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Förvirrad"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Kontemplativ"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Utmanad"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Excentrisk"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Galen"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Kreativ"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Nyfiken"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Bedrövad"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Deprimerad"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Besviken"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Äcklad"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Förskräckt"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Distraherad"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Besvärad"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Avundsjuk"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Upphetsad"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Flirtig"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Frustrerad"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Tacksam"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Sörjer"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Grinig"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Glad"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Hoppfull"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Het"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Spak"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Förödmjukad"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Hungrig"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Sårad"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Imponerad"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Respektfull"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Kär"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Upprörd"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Intresserad"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Berusad"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Oövervinnelig"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Ensam"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Förlorad"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Lycklig"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Elak"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Lynnig"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Nervös"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Förolämpad"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Rasande"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Lekfull"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Stolt"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Avslappnad"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Lättad"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Ångerfull"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Rastlös"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Ledsen"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Nöjd"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Seriös"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Chockad"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Blyg"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Sjuk"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Sömning"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Stressad"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Stark"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Överraskad"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Tacksam"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Törstig"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Trött"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Svag"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Bekymrad"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "standard"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Gömmer sig"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Land:"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Beskrivning"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Fel."
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "ett"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "rum"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Kunde inte få tag på utfärdarens certifikat"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Kunde inte få tag på certifikatspärrlista"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kunde inte dekryptera certifikatets signatur"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kunde inte dekryptera spärrlistans signatur"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Kunde inte avkoda utfärdarens publika nyckel"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Fel i certifikatsignatur"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Fel i spärrlistans signatur"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet är ännu inte giltigt"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Certifikatet har gått ut"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "Spärrlistan är ännu inte giltig"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "Spärrlistan har gått ut"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfel i certifikatets notBefore-fält"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfel i certifikatets notAfter-fält"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfel i spärrlistans lastUpdate-fält"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfel i spärrlistans nextUpdate-fält"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Självsignerat certifikat"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Självsignerat certifikat i certifikatkedja"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Kunde inte verifiera det första certifikatet"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Certifikatkedjan är för lång"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Certifikatet spärrat"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Ogiltigt CA-certifikat"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Certifikatet är inte pålitligt"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Certifikatet nekades"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Certifikatet spärrat"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Okänt SSL-fel: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Certifikatet har gått ut"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Auktorisering accepterad"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Certifikatet har gått ut"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Kryptering aktiverad"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Utökning stöds inte"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Autentisering mot \"%s\" misslyckades"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4884,12 +4823,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rumkonfiguration"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4901,295 +4840,254 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr ""
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Ogiltigt tecken i värdnamn."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Serveradress krävs."
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Ogiltigt tecken i användarnamn"
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Ogiltigt tecken i resurs."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Upptagen"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pausad"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pausad"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "Fr_ånvarande"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Frånvarande"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Till"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Från"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Båda"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Okänt"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Deltagare"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Deltagare"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Besökare"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Besökare"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Ägare"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Ägare"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Administratör"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Administratör"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "skriver ett meddelande..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d meddelande väntar"
 msgstr[1] "%d meddelanden väntar"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "i _gruppchattar"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " från användaren %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " från %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d väntande händelse"
 msgstr[1] "%d väntande händelser"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Bild är för stor"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Spärrlistan är ännu inte giltig"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s är en fil men den borde vara en katalog"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu att avslutas"
 
@@ -5288,83 +5186,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Filen är tom"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Kryptering deaktiverad"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Ändra statusinformation"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Ändra status"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Ställ in närvarotypen och en beskrivning"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Ledig för chatt"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Ansluten"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Utökad frånvaro"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Stör inte"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Frånkopplad - koppla från"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Beskrivning av närvaro:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Statusen har ändrats."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Skickade kontakt: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Bjud in _kontakter"
@@ -5388,7 +5286,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Konto"
 
@@ -5399,7 +5297,7 @@ msgstr "Gruppchattar"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Lösenord:"
@@ -5423,7 +5321,7 @@ msgstr "i _gruppchattar"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Gå in i"
@@ -5441,17 +5339,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -5598,7 +5496,7 @@ msgstr "Kontaktinformation"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -5804,39 +5702,44 @@ msgstr "Jobb"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Om"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Gå in i gruppchatt"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Snart tillbaka"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Gå in i"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "Tar bort %s konto"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5906,6 +5809,7 @@ msgid "Strike"
 msgstr "Genomstruken"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Färg"
 
@@ -5918,137 +5822,132 @@ msgstr "Typsnitt"
 msgid "Clear formatting"
 msgstr "Ingen formatering"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Välj fil att skicka..."
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Visa en lista över känsloikoner (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Bannlyser..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "E_fter smeknamn:"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Byt smek_namn..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Byt _ämne..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Ange nytt lösenord:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Lämna gruppchattar"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "Om kryssad kommer Gajim att gå in i den här gruppchatten vid uppstart"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Ett fel har inträffat:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Verifiera igen..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Deltagare"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "Sparka _ut"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 #, fuzzy
 msgid "Insert Emoji"
 msgstr "Hantera känsloikoner"
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Deltagare"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Ny gruppchatt"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Förstör %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Anledning"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Bjud _in"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Händelse"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Händelser"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6146,20 +6045,20 @@ msgid "Add"
 msgstr "Lägg till"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "Ta _bort"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Resurs:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Status"
 
@@ -6169,7 +6068,7 @@ msgid "Client"
 msgstr "Klient:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>System:</b>"
@@ -6316,38 +6215,39 @@ msgstr "_Fönsterbeteende:"
 msgid "_Show contact list on startup"
 msgstr "Visa registerfönstret när Gajim startar"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Sa_mmanfoga konton"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Visa a_vatarer för kontakter i kontaktlista"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6356,12 +6256,12 @@ msgstr ""
 "Om kryssad kommer Gajim att visa avatarer för kontakter i kontaktfönster och "
 "gruppchattar"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Visa status_meddelanden för kontakter i kontaktlista"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6370,53 +6270,53 @@ msgstr ""
 "Om kryssad kommer Gajim att visa statusmeddelanden för kontakter under "
 "kontaktens namn i kontaktfönster och gruppchattar"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Visa _humör för kontakter i kontaktlista"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Bjud in _kontakter"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "i _gruppchattar"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Kontakt loggade ut"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Stavningskontroll"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6424,29 +6324,29 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "meddelandeinnehåll"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Visa en lista över formateringar"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Visa status_meddelanden för kontakter i kontaktlista"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6455,58 +6355,58 @@ msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Registreringen misslyckades"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Logga statusändringar för kontakter"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Visa stängningsknapp i flik?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6515,66 +6415,69 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Visa stängningsknapp i flik?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
+"du använder"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Senaste status: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 msgid "Chat"
 msgstr "Chatt"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "När ny händelse tas emot:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Tillåt popup/notifieringar när jag är _frånvarande/inte tillgänglig/upptagen/"
 "osynlig"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Tillåt popup/notifieringar när jag är _frånvarande/inte tillgänglig/upptagen/"
 "osynlig"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifiera mig om kontakter som loggar _in"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 #, fuzzy
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
@@ -6583,64 +6486,64 @@ msgstr ""
 "Gajim kommer att meddela dig om nya händelser via en popup i höger nederkant "
 "av skärmen"
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifiera mig om kontakter som loggar _ut"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Visuella notifieringar</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Spela _upp ljud"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Ha_ntera..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Tillåt ljud när jag är _upptagen"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Ljud"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Inte tillgänglig"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr "Om ibockad kommer Gajim också att ha en aktivitetsfältsikon"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr "Om ibockad kommer Gajim också att ha en aktivitetsfältsikon"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6648,7 +6551,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6656,107 +6559,107 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "minuter"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Automatisk status"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Fråga efter statusmeddelande när jag:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Standardmeddelande"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Statusmeddelande"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Förvalda statusmeddelanden</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Tema"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Konfigurera färger och typsnitt för gränssnittet"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "gajim-remote"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Status_ikoner:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Använd _transporternas ikoner"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6766,118 +6669,128 @@ msgstr ""
 "en kontakt från MSN kommer att ha motsvarade MSN-ikon för tillgänglig, "
 "frånvarande, upptagen, osv...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 #, fuzzy
 msgid "_Convert ASCII Emojis"
 msgstr "Hantera känsloikoner"
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Stil"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Funktioner"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 msgid "A_udio output device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 msgid "_Audio input device"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 msgid "Audio"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 msgid "Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Standardmeddelande"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "Privat Chatt"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 msgid "Video _framerate"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 msgid "Video si_ze"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Anslutning"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Server:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 msgid "Audio/Video"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Hantera..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Logga statusändringar för kontakter"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Om kryssad kommer Gajim att komma ihåg lösenordet för detta konto"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Diverse</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Avancerad konfigurationsredigerare"
@@ -7062,12 +6975,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Ange nytt lösenord:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Avancerade åtgärder"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Använd anpassat värdnamn/port"
@@ -7154,7 +7067,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Loggar _in"
@@ -7168,7 +7081,7 @@ msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7198,8 +7111,8 @@ msgstr "_Återställ till standardfärger"
 msgid "Resets value to default"
 msgstr "_Återställ till standardfärger"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Värdnamn:"
@@ -7243,7 +7156,7 @@ msgstr "Självsignerat certifikat"
 msgid "Proxy Host"
 msgstr "Proxyser_ver:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Typ"
 
@@ -7257,8 +7170,7 @@ msgstr "_Protokoll:"
 msgid "Copy info to clipboard"
 msgstr "_Kopiera länkplats"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Funktioner"
 
@@ -7445,6 +7357,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Ändra statusmeddelande"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humör:</b>"
@@ -7521,8 +7438,8 @@ msgstr "Avstannad"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7712,80 +7629,106 @@ msgstr "Registreringen misslyckades"
 msgid "_Name"
 msgstr "_Namn:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxyserver:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Starta Chatt"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Lämna gruppchattar"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Historikhanterare"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
+msgstr "Registreringen misslyckades"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Inställningar"
 
-#: gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/application_menu.ui:36
 #, fuzzy
-msgid "Quit"
-msgstr "A_vsluta"
+msgid "_Accounts"
+msgstr "Konton"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Visa"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Visa endast _aktiva kontakter"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Visa frånkopplade _kontakter"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Visa endast _aktiva kontakter"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Visa _transporter"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML-konsol"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Filöverföringar"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Hjälp"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Ansluten"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Ansluten"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Funktioner"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7800,6 +7743,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Lämna gruppchattar"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8087,60 +8035,68 @@ msgstr "Kontakt loggade ut"
 msgid "Create new group chat"
 msgstr "Lämna gruppchattar"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Filöverföringar"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "statusmeddelande"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Visa _XML-konsoll"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Chattutseende</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Visa frånkopplade _kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Visa endast _aktiva kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Visa endast _aktiva kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Kontaktinformation"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Byt namn på kontakt"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Bjud in _kontakter"
@@ -8217,12 +8173,16 @@ msgstr "Fyll i formuläret."
 msgid "Group Chat Configuration"
 msgstr "Inbjudan till Gruppchatt"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML-konsol"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Starta chatt..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
@@ -8268,11 +8228,6 @@ msgstr "Visa alla väntande _händelser"
 msgid "Mute Sounds"
 msgstr "Inga ljud"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Inställningar"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8593,124 +8548,124 @@ msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Gruppchattar"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Gruppchattar"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Denna gruppchatt saknar ämne"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Gruppchattar"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Gruppchattar"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Gruppchattar"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Inbjudan till Gruppchatt"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Sessionen KOMMER INTE att loggas"
@@ -8739,7 +8694,7 @@ msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Mottagare: "
 
@@ -8893,7 +8848,7 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Sändare: "
 
@@ -8908,7 +8863,7 @@ msgid "Change"
 msgstr "Byt smek_namn..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Snart tillbaka"
@@ -8939,11 +8894,12 @@ msgid "Password Change Failed"
 msgstr "Lösenord krävs"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Ett fel uppstod när kontot skapades"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Byt lösenord"
 
@@ -8981,40 +8937,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Okänt SSL-fel: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Fortsatt konversation"
+msgid "Start / Join Chat"
+msgstr "Starta Chatt"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Gå in i gruppchatt"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Lägg till kontakt..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s kunde inte hittas"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9023,33 +8974,33 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Andra"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "_Gruppchatt"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "Du kan inte bläddra bland tillgängliga tjänster utan en anslutning"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9057,143 +9008,143 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Denna typ av tjänst innehåller inga objekt att bläddra genom."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bläddrar i %(address)s med kontot %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Bläddra"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Denna tjänst innehåller inga objekt att bläddra genom."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "Kommandon: %s"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Sök"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Söker av %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Användare"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Nod"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Ny post"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Skicka ett meddelande"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "ämne"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Ett meddelande med kontot %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Ett meddelande i kontot %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Tecknet tillåts inte"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr ""
 "Det gick inte att skicka ett meddelande till %s, denna JID är inte giltig."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
@@ -9239,93 +9190,75 @@ msgstr "Kontoregistrering lyckades"
 msgid "Registration failed"
 msgstr "Registreringen misslyckades"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Ordbok för språket %s inte tillgängligt"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Du måste installera %s-ordboken för att använda stavningskontroll, eller "
-"välja ett annat språk genom att ställa in alternativet speller_language.\n"
-"\n"
-"Markeringsfunktionen för felstavade ord kommer inte att användas"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "för kontot %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG-nummer:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Inbjudan till Gruppchatt"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact har bjudit in dig till gruppchatten %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -9340,6 +9273,11 @@ msgstr "GG-nummer:"
 msgid "ICQ Number"
 msgstr "ICQ-nummer:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Lägg till kontakt..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9395,7 +9333,7 @@ msgstr "Fel när tjänsten lades till. %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9557,43 +9495,63 @@ msgstr "Kontakt loggade ut"
 msgid "Contact Connected Background "
 msgstr "Kontakt loggade in"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Statusmeddelande"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Statusmeddelande"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Statusmeddelande"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Statusmeddelande"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "gajim-remote"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Ogiltigt smeknamn"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Tecknet tillåts inte"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Vill du verkligen ta bort det valda meddelandet?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "Detta namn används redan. Vill du skriva över detta statusmeddelande?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktiv"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Registreringen misslyckades"
@@ -9617,10 +9575,9 @@ msgid "Error: %s"
 msgstr "Felmeddelande: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 #, fuzzy
 msgid "Error"
 msgstr "Fel."
@@ -9635,48 +9592,48 @@ msgstr "Status är nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Alla filer"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Städar"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Hantera proxyprofiler"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxyserver:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Justera efter status"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Frånkopplad"
@@ -9697,7 +9654,7 @@ msgstr "Konto"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Ditt nya konto har skapats"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9730,60 +9687,65 @@ msgstr "_Registrera nytt konto"
 msgid "Account has to be connected"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Synkronisera"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Vad vill du göra?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ansluter"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Vidarebefordra olästa meddelanden"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "En GTK+-baserad Jabber-klient"
@@ -9846,127 +9808,127 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Välj fil att skicka..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Välj Bild"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Alla filer"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Alla filer"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Skicka fil"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Bilder"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Välj Bild"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Alla filer"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Spara fil som..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenGPG"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av den här gruppchatten"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Ansluten"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Filnamn: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Hämta"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Skicka upp"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Filöverföringen stoppad"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:Pausad"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:Pausad"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Beskrivning: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:Pausad"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:Pausad"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pausad"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:Pausad"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:Pausad"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Pausad"
@@ -9975,7 +9937,7 @@ msgstr "?transfer status:Pausad"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Ogiltig Fil"
@@ -10031,26 +9993,26 @@ msgstr "Meddelande markerat i gruppchatt"
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Lösenord krävs"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Ingen"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Avbryt"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10069,11 +10031,6 @@ msgstr "använder kontot %s"
 msgid "Hide _Contact List"
 msgstr "Bjud in _kontakter"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Visa endast _aktiva kontakter"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
@@ -10123,36 +10080,31 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, försök "
 "igen senare."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "_Inställningar"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "_Inställningar"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Du är inte ansluten till servern"
+msgid "Archiving Preferences Error"
+msgstr "_Inställningar"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Tjänsten returnerade ett fel."
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "_Inställningar"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktiverad"
@@ -10201,178 +10153,178 @@ msgstr "?Fråga (för prenumeration):Ingen"
 msgid "?password:Hidden"
 msgstr "Lösenord:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "_Inställningar"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr ""
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Funktionen är inte tillgänglig under Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Kräver libxss-biblioteket."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Kräver python-gnome2."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Kräver gpg och python-GnuPGInterface."
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Anslutning"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Kräver libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Funktionen är inte tillgänglig under Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Notifieringar"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Kräver python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Spara lösenord"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Lösenord kan lagras säkert och inte bara i klartext."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Kräver gnome-keyring och python-gnome2-desktop, eller kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Stavningskontroll"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Kräver libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Kräver python-gnome2."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "_Inställningar"
@@ -10419,7 +10371,7 @@ msgstr "Ogiltigt listnamn"
 msgid "You must enter a name to create a privacy list."
 msgstr "Du måste ange ett namn för att skapa en integritetslista."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Bjud in _kontakter"
@@ -10447,7 +10399,7 @@ msgstr "F_ärdigställ"
 msgid "Commands"
 msgstr "Kommandon: %s"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10520,119 +10472,133 @@ msgstr "Prenumerationsförfrågan från %s"
 msgid "Loading"
 msgstr "Programmerar"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Ansluten"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 #, fuzzy
 msgid "Log In"
 msgstr "Ans_lut"
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skapades"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Tar bort %s konto"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Klicka för att byta kontots lösenord"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Ansluter"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Din server saknar stöd för Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Tecknet tillåts inte"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Din server saknar stöd för Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Anslutningsfel"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Lägg till kontakt..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Skapa ny post"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Inställd port måste vara ett portnummer."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Avancerade åtgärder"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Bannlyser %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Okänt SSL-fel: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Tar bort %s konto"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Registrera till %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Konto"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Kontot har lagts till"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Konton"
@@ -10675,250 +10641,254 @@ msgstr "Sök"
 msgid "No results found"
 msgstr "Inga resultat"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Standard"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Återanslut nu?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Återanslut nu?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "Om du vill att ändringarna skall ske omedelbart måste du återansluta."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 #, fuzzy
 msgid "_Later"
 msgstr "_Tidigaste"
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Ogiltigt kontonamn"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Ogiltigt kontonamn"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Bjud in _kontakter"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Självsignerat certifikat"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "A_nslut vid start av Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Spara konversations_loggar för alla kontakter"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Alla statusar"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Ändrar status för konto eller konton"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Använd proxyservrar för filöverföringar"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr " sedan %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Bjud in _kontakter"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i kontaktlistan"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tet:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_Använd miljövariabeln HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Ändrar status för konto eller konton"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Förnamn:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Efternamn:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Ny E-post"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Justera efter status"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 msgid "Enable"
 msgstr "Aktivera"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Anslutning"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Självsignerat certifikat"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Spara lösenord"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registreringen misslyckades"
@@ -10969,19 +10939,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Ta bort en kontakt från kontaktlista"
 msgstr[1] "Ta bort en kontakt från kontaktlista"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Okänd artist"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Okänd titel"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Okänd källa"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10995,21 +10965,21 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Bokmärk"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Filen är tom"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -11066,127 +11036,237 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Visa alla väntande _händelser"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Funktioner"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Stavningskontrollerar meddelanden."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Söker tjänster med konto %s"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kontakter"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Gruppchattar"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Logghistorik"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Registreringen misslyckades"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Fortsatt konversation"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Okänt SSL-fel: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Ordbok för språket %s inte tillgängligt"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Du måste installera %s-ordboken för att använda stavningskontroll, eller "
+#~ "välja ett annat språk genom att ställa in alternativet speller_language.\n"
+#~ "\n"
+#~ "Markeringsfunktionen för felstavade ord kommer inte att användas"
+
+#, fuzzy
+#~ msgid "_Reconnect"
+#~ msgstr "_Koppla från"
+
+#, fuzzy
+#~ msgid "Quit"
+#~ msgstr "A_vsluta"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Visa endast _aktiva kontakter"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Lägg till kontakt..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Bjud in _kontakter"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Lämna gruppchattar"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Ny gruppchatt"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Om sant kommer Gajim att visa en ikon på varje flik som innehåller olästa "
+#~ "meddelanden. Beroende på temat så kan denna ikon vara animerad."
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Ogiltigt tecken i värdnamn."
+
+#~ msgid "Server address required."
+#~ msgstr "Serveradress krävs."
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Ogiltigt tecken i användarnamn"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Ogiltigt tecken i resurs."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Notifiera mig om kontakter som loggar _in"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Notifiera mig om kontakter som loggar _ut"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Chattstatusmeddelanden:"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Meddela mig när en filöverföring är färdig"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Meddela mig när en filöverföring är färdig"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Bakgrundsfärg på kontakter när de precis loggat in."
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Händelse"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Händelser"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Du är inte ansluten till servern"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Resurskonflikt"
 
@@ -11783,9 +11863,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Skicka privat meddelande"
 
-#~ msgid "Send _File"
-#~ msgstr "Skicka _fil"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Deltagare"
@@ -13814,10 +13891,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Install/Upgrade"
 #~ msgstr "Avstannad"
 
-#, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Registreringen misslyckades"
-
 #~ msgid "cyan"
 #~ msgstr "cyan"
 
@@ -14310,9 +14383,6 @@ msgstr "Registreringen misslyckades"
 #~ "konfiguration så kan du välja en annan här.\n"
 #~ "Du kan dock överväga att ändra möjliga brandväggsregler."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Sa_mmanfoga konton"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP är inte användbar på den här datorn"
 
@@ -14724,9 +14794,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Kräver python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Kräver gnome-keyring och python-gnome2-desktop, eller kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/tr.po b/po/tr.po
index 644b61708..fdcab7aa7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13.10.2-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2010-03-24 22:29+0100\n"
 "Last-Translator: Ferdi Kunzmann <shegman@tablatures.de>\n"
 "Language-Team: Turkish\n"
@@ -18,75 +18,81 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Bookmarks: -1,-1,66,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Hesaplar"
+
+#: gajim/chat_control_base.py:570
 #, fuzzy
 msgid "and authenticated"
 msgstr "bir ses ve video"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "ve YETKİLENDİRİLMEMİŞ"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Geri Al"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Temizle"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Resim seç"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 msgid "You are trying to paste an image"
 msgstr ""
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Bu iletişim kutusunu bir daha _gösterme"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "ben burdaysam"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Devam"
 
@@ -146,498 +152,494 @@ msgstr "Bekleyen üyelemek soru yok."
 msgid " resource with priority "
 msgstr "Beni bir açılan pencereyle _haberle"
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "_Çevredışı Kişileri Göster"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Seni kişi listeme eklemek isterdim"
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Tek bir İlet gönder"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Komuta _Yürüt"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Aktarım protokolü"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Aktarım protokolü"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Ad Değiştir"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "Engellemeyi _Kaldır"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Engelle"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "K_aldır"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Bilgi"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "_Dosya Gönder…"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Son durum: %s"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Kişi Davet _Et"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "Kişi _ekle"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Dosya Gönderme Soru"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Video testi"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Bilgi"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Geçmiş"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Geçersizleşti"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Sadece yazıştırıyor"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Bütün sohbet durumlar"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Kişi Davet _Et"
+msgid "All Chat States"
+msgstr "Bütün sohbet durumlar"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Tam-Ekrandan Çık"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Tam-Ekrandan Çık"
+msgid "Rename…"
+msgstr "_Ad Değiştir"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "Konuk Değiştiriliyor"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "Tam-Ekrandan Çık"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Resim seç"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "_Yeni Bir Grup Sohbeti"
+msgid "Configure…"
+msgstr "_Yerleştir"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Açıklama"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Önceden hazırlanmış iletleri:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "Kapatınca küçült"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Kendilinden Katılınca Küçült"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Takma Ad Ayarla"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Ses"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "Komuta _Yürüt"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Sadece yazıştırıyor"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Bütün sohbet durumlar"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "Kişi _ekle"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "dosya"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Tek bir İlet gönder"
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
-msgstr ""
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
+msgstr "Çevrimiçi Servisler"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "_Sunuc:"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "İlerlemiş"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Tercihler"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Yer imi"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Oda Yerleştirme"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Kişisel Gizlilik Listesini biçimle"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Yönetici"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "Tek Bir İleti Gönder…"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "MOTD'yi yaz"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "MOTD'yi yenileştir"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Sil"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "Kişi _ekle"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "%s hesaptan"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "%s hesaptan"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "AIM Adres:"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Grup Sohbete Katıl"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 #, fuzzy
 msgid "Start Chat"
 msgstr "Sohbet _Başla"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "Kişi _ekle"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 msgid "Copy Link Location"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 msgid "Copy Email Address"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "Yer:"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Yer:"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 msgid "Copy XMPP Address/Email"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "Davet _et"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "Engellemeyi _Kaldır"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Engelle"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 msgid "Kick"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Sahibi"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Yönetici"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Üye"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Üye"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Ses"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "Oda JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "mesaj"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "Duygu _Simgeler:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Dosya mevcut değil"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM Adres:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Tarih"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -645,309 +647,314 @@ msgstr "Tarih"
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "İleti"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Konu"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Hata açıklaması…"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "%s/base/1 içinde template1 veritabanı yaratılıyor. "
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
 "Normally, the allocated database size will not be freed, it will just become "
 "reusable. This operation may take a while."
 msgstr ""
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Temizle"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Sen"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Sil"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Dosya transferi iptal et"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Öntanımlı İlet"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "İlk Ad:"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Genel"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Grup"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "Grupda"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Ruh Halini Ayarla"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Hiçbiri"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, fuzzy, python-format
 msgid "%s Status Message"
 msgstr "durum ileti"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 #, fuzzy
 msgid "Status Message"
 msgstr "durum ileti"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Durum ileti değiştir"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "durum ileti"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Önceden hazırlanmış olarak kaydet:"
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 msgid "Please assign a name to this status message preset"
 msgstr ""
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Sahip"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Durum"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 #, fuzzy
 msgid "You are not connected to the server"
 msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Adı"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 #, fuzzy
 msgid "Server"
 msgstr "_Sunuc:"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 #, fuzzy
 msgid "Synchronise"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "bir ses ve video"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "bir ses"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "bir video"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "_Dosya Gönder…"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Geçersiz Dosya"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Resim acılamadı"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, python-format
 msgid "Kick %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Takma Ad girdir"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Dosya Gönderme Soru"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 msgid "_Approve"
 msgstr ""
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "Değerin maskenin sğında fazladan bitler var."
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "grup %s yok - root kullanılacak\n"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "%s: OID (-o) 0 olamaz\n"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Senin kişimsel informationun, nasıl sunucdaysa"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Grup sohbetler"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Grup sohbetler"
@@ -962,7 +969,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Hata."
 
@@ -990,22 +997,22 @@ msgstr "Yeni bir oda yaratılmıştır"
 msgid "Failed to Configure Group Chat"
 msgstr "Tam-Ekrandan Çık"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Adınızı %s olarak değiştirdiniz"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Adınızı %s olarak değiştirdiniz"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s durumu şimdi %(status)s"
@@ -1130,80 +1137,80 @@ msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 msgid "If you close this window, you will leave '%s'."
 msgstr ""
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr ""
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr ""
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, fuzzy, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "Sohbet durum haberleri _göster:"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "\"%s\"den yeni bir ileti aldın"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Gönder & Kapat"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Yeni Mesaj"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Gönder & Kapat"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1212,190 +1219,181 @@ msgstr ""
 "Konu: %(subject)lar\n"
 "%(message)lar"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Dosya Aktarımları"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "%1 (boyut %2)"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "Hesaplar"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Bağlı _değil"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Dosya Gönderimi Tamamlandı"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Grup Sohbeti Daveti"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Dosya açılırken hata"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 msgid "Show the application's version"
 msgstr ""
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Kişi listesindeki olayları göster"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "İlerlemiş Ayarlama Editörü"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Hata açıklaması…"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Bütün Bekleyen _Olayları Göster"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr ""
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Sohbet _Başla"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 #, fuzzy
 msgid "Database Error"
 msgstr "Hata açıklaması…"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 #, fuzzy
 msgid "Merged accounts"
 msgstr "Hesapları bir_leştir"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Taşıma"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Grup sohbetler"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 #, fuzzy
 msgid "Subscription request has been sent"
 msgstr "Onay e-postası gönderildi."
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
@@ -1405,7 +1403,7 @@ msgstr ""
 msgid "desynced"
 msgstr "-e  --ed  Bir ed betiği çıktılar."
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1426,7 +1424,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Gajimi her zaman kapat"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
@@ -1569,8 +1568,8 @@ msgstr "Grupu yeniden adlandır"
 msgid "Please enter a new name"
 msgstr "Yeni posta yarat"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Adı _değiştir"
@@ -1589,47 +1588,52 @@ msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Bide bütün grupdaki kişileri listeden sil"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Tam-Ekrandan Çık"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "Grup %s için yeni isim giriniz: "
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Kişiyi listeden sil"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Devam etmek istiyor musunuz?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Silindikten sonra bu kişi benim durumu bilsin"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Kişiyi listeden sil"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1638,162 +1642,163 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 msgid "You are about to create a metacontact"
 msgstr ""
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
 "Generally it is used when the same person has several XMPP- or Transport-"
 "Accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Yaratıcı"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Adres verilmedi"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "Yapmak istediğiniz şey bu mu?"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Gönder"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Bunu %s buna %s gönder"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "bir ses ve video"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "bir ses ve video"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "Durum ileti değiştir"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 #, fuzzy
 msgid "Publish Tune"
 msgstr "Albüm Ayarı"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 #, fuzzy
 msgid "Publish Location"
 msgstr " B - DosyaKilidi konumu"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 #, fuzzy
 msgid "_Maximize All"
 msgstr "Bütün durumlar"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "grupdaki herkez"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Tüm kullanıcılara"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Tüm çevredeki kullanıcılara"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Buna davet _et"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Kişisel ilanlar sayfayı yazımla"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 #, fuzzy
 msgid "_Maximize"
 msgstr "Ekranı kapla"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Adı _değiştir"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Yeniden bağlan"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "Komuta _Yürüt"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Geçmiş"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 #, fuzzy
 msgid "History Manager"
 msgstr "Paket Yöneticisi"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "İzlemci"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1924,224 +1929,224 @@ msgstr "Kişisel Sohbetler"
 msgid "Messages"
 msgstr "İletler"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr ""
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Ricayı kabul ediyor musunuz?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Ricayı kabul ediyor musunuz?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Hiçbiri"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Üyelik isteği"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 #, fuzzy
 msgid "Authorization accepted"
 msgstr "Değer kabul edildi!"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr ""
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Üyelik İsteği"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "\"%s\" kişi listesinden silincek"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 msgid ""
 "You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "Üyelikten çıkarıldı"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr ""
 "Şuraya bir yorum gönderiyorsunuz:\n"
 "  "
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Gadu-Gudu hesabı için parola değiştir"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, fuzzy, python-format
 msgid "Enter your password for account %s"
 msgstr "Gadu-Gudu hesabı için parola değiştir"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 #, fuzzy
 msgid "Password Required"
 msgstr "Şifre gerekli"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 #, fuzzy
 msgid "Save password"
 msgstr "Parolayı Değiştir"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Dosya Gönderim Hatası"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s size bir dosya göndermek istiyor."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Dosya Gönderim İsteği"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Kişiyi listeden sil"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Dosya açılırken hata"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Dosya Gönderimi Durduruldu"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, fuzzy, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Gönderdiğiniz iletide yazacak adın rengi."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Gönderdiğiniz iletide yazacak adın rengi."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Kullanan ad Çarpışması"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "Grup %s için yeni isim giriniz: "
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Tamam"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr ""
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Dosya Gönderme Soru"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Tehlikeli bağlantı"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2149,20 +2154,20 @@ msgid ""
 "Connecting PLAIN is strongly discouraged."
 msgstr ""
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Connecting"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2359,11 +2364,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2670,77 +2675,72 @@ msgid ""
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr ""
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Yaratıcı"
 
-#: gajim/common/connection_handlers_events.py:73
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "<b>Bir hata oluştu:</b>"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Yeni kişisel Mesaj"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "%(nickname)s den Yeni İlet alındı"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "_Yeni Bir Grup Sohbeti"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Durumu değiştirdi"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Bağlantı Durumunu Değiştirdi"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Bağlantı Giriş Yaptı"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Bağlantı Çıkış Yaptı"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Kimliksiz kimlik doğrulaması"
@@ -2801,105 +2801,64 @@ msgid ""
 msgstr ""
 
 #: gajim/common/config.py:93
-#, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "_Giren kişilerden haber ver"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "_Çıkan kişilerden haber ver"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Dosya Gönderme Tamamlandı"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "_Bir dosya aktarımı tamamlandığında beni bilgilendir"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "_Bir dosya aktarımı tamamlandığında beni bilgilendir"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-msgid "Notification background color for changed status."
-msgstr ""
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "öntanımlı"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "başka programlarca kullanılan: "
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
 msgstr ""
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr ""
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr ""
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 msgid ""
 "This option lets you customize the timestamp that is printed in "
 "conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
@@ -2907,172 +2866,166 @@ msgid ""
 "time.html#time.strftime)."
 msgstr ""
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
 msgstr ""
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr ""
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
 "'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
 "(chat, private chat, group chat that will not be minimized)."
 msgstr ""
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
 "file transfers (in case of address translation/port forwarding)."
 msgstr ""
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr ""
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 #, fuzzy
 msgid "Show close button in tab?"
 msgstr "Başlık çubuğu içeriğini sekme çubuğu etiketlerinde göster"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
 msgstr ""
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
 "This setting is taken into account only if the notification area icon is "
 "used."
 msgstr ""
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
 "the contact name in the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
 "contact changes their status (and/or their status message)."
 msgstr ""
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
 "Window Managers) when holding pending events."
 msgstr ""
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3084,7 +3037,7 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3092,276 +3045,271 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Konuşma penceresinde tüm düğmeleri gizle"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 msgid "Hides the group chat participants list in a group chat window."
 msgstr ""
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking as in the previous message."
 msgstr ""
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr ""
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr ""
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
 "the Accounts window. BE CAREFUL, when you are logged in with a negative "
 "priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr ""
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
 "message, if the chat window is not already opened."
 msgstr ""
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:238
-#, fuzzy
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Denetimler arasındaki süre %lu saniye olarak belirleniyor\n"
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
 "(mailto and xmpp are handled separately)."
 msgstr ""
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
 "in 'stun_server' option, or the one given by the XMPP server."
 msgstr ""
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr ""
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr ""
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Bu odayi yer imle"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr "Durumuna göre öncelik kendilinden değişir."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
 "'away', 'xa' or 'dnd'. NOTE: This option is used only if "
 "'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr ""
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3370,1331 +3318,1327 @@ msgstr ""
 "Bunu işaretleyince Gajim göndermeden sorar parolayı tehlikeli bir bağlantı "
 "üzerinden göndersin mi diye."
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
 "'file_transfer_proxies' option for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s size bir dosya göndermek istiyor."
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
 "your machine for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Bu dizin için seçici erişim etkinleştirilmemiş"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
 "Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the "
 "plugin window instead."
 msgstr ""
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 #, fuzzy
 msgid "Sleeping"
 msgstr "Uyuyan bir kapibara."
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 #, fuzzy
 msgid "Back soon"
 msgstr "Geri Düğme"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 #, fuzzy
 msgid "Back in some minutes."
 msgstr "Bekleme süresi (dakikalar)"
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Yemelik"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr " Çalışılıyorum"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Filim"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Bir filim bakiyorum."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr " Çalışılıyor"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr " Çalışılıyorum"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Telefondayım"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Dış"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 #, fuzzy
 msgid "I'm available."
 msgstr "Mevcut Değil"
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Sohbet için Hazırım"
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 #, fuzzy
 msgid "Be right back."
 msgstr "Hemen Dönecek"
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 #, fuzzy
 msgid "I'm not available."
 msgstr "Mevcut Değil"
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Rahatsız Etme."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Güle Güle!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "'muc_highlight_words' or your nickname is mentioned."
 msgstr ""
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "Kime"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Hata: %s okumak için açılamıyor"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Grup sohbetler"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Grup Sohbeti Daveti"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Grup Sohbeti Daveti"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "Grup Sohbetler"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Grup sohbetler"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "grup %s yok - root kullanılacak\n"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "_Yeni Bir Grup Sohbeti"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Hizmet bulunamadı"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Dosyası zaten var"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "grup %s yok - root kullanılacak\n"
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Grup sohbetler"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Doing Chores"
 msgstr "dosya indeksi taraması yapılırken"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Alişverişde"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Temizleniyor"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Pişirmede"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "Doing Maintenance"
 msgstr "teşhis için; zıpla, zıpla"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 #, fuzzy
 msgid "Doing the Dishes"
 msgstr "dosya indeksi taraması yapılırken"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 #, fuzzy
 msgid "Doing the Laundry"
 msgstr "dosya indeksi taraması yapılırken"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Bahçecilik"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Running an Errand"
 msgstr "Başka bir Gajim zaten çalışıyor "
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Ağaçta gezinme başarısız"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "İçmede"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "Bir Birada"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 #, fuzzy
 msgid "Having Coffee"
 msgstr "Bir Birada"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "Bir Çayda"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Bir hafif Yemekte"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Kahvaltıda"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Akşam yemekte"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Yemekte"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Antrenmanda"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 #, fuzzy
 msgid "Cycling"
 msgstr "Çevrim renkleri"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Dansda"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Yürüşde"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Koşuda"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 #, fuzzy
 msgid "Playing Sports"
 msgstr "DVD'leri Oynatmak"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 #, fuzzy
 msgid "Running"
 msgstr "Çalıştırılıyor"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Kayakta"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Yüzmekte"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Working out"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Tımarlamada"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "Spa'da"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Diş furçalamada"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Berberde"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Traşda"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Banyo yapıyor"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Duş alıyor"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "Bir Buluşmada"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Pasif"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Day Off"
 msgstr "Günün İletisini Sil"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Hanging out"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Saklanmada"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 #, fuzzy
 msgid "On Vacation"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Namaz kılmada"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Planlamış Tatilde"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Düşüncede"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 #, fuzzy
 msgid "Relaxing"
 msgstr "İlintileyici esnekliği etkin olur"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Balık avlamada"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Oyunda"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Going out"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Eğlencede"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 #, fuzzy
 msgid "Reading"
 msgstr "Dosya okunurken hata:"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Provada"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Alışverişde"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Sigara içmekte"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Arkadaşlarlan buluşmakta"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Güneşlencede"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 #, fuzzy
 msgid "Watching TV"
 msgstr "Bir filim bakiyorum."
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Filim bakmakta"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 #, fuzzy
 msgid "Talking"
 msgstr "%s'le konuşurken hata oldu (%s)"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "In Real Life"
 msgstr "Buna davet _et"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 #, fuzzy
 msgid "On Video Phone"
 msgstr "bir ses ve video"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Gezide"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Değiştircede"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Araba sürüyor"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "In a Car"
 msgstr "ben burdaysam"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 #, fuzzy
 msgid "On a Bus"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 #, fuzzy
 msgid "On a Plane"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "Trende"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "On a Trip"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "Yürüyor"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Kodlamada"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 #, fuzzy
 msgid "In a Meeting"
 msgstr "ben burdaysam"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Okumakta"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Writing"
 msgstr "%s yazılıyor..."
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Korkmuş"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Şaşkın"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Sevdalı"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Kızgın"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Sinirli"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Sıkıntılı"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Uyandırılmış"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Mahçup"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Sıkılmış"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Cesur"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Sakin"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Dikkatli"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Soğuk"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Cüretli"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Şaşkın"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Dalgın"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Mutlu"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Tuhaf"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Çılgın"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Yaratıcı"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Meraklı"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Üzgün"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Deprese"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Kırgın"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "İğrenmiş"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Korkutulmuş"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Şaşırmış"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Utangaç"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Kıskanç"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Heyecanlı"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Çapkın"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Yılmış"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Memnun"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Matemli"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Somurtkan"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Suçlu"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Mutlu"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Ümitli"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Sıcak"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Mütevazi"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Alçalmiş"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Aç"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Kırgın"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Üzerinde etki bırakılmış"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Üzgün"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Aşık"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Öfkeli"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "İlgili"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Sarhoş"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Yenilmez"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Kıskanç"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Yanlız"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Kaybettin"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Uğurlu"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Ortalama"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Değişken"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Heyecanlı"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Nötr"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Küskün"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Nefretli"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Oyunbaz"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Şerefli"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 #, fuzzy
 msgid "Relaxed"
 msgstr "gevşek (TagSoup kipi)"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Ferahlamiş"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Pişmanlı"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Rahatsız"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Üzgün"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Kinayeli"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Memnun"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Ciddi"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Sarsılmış"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Utangaç"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Hasta"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Uykulu"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Vurgulu"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Güçlü"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Şaşırmış"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Şükreden"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Susamış"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Yorgun"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Tanımsız"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Kuvvetsiz"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Düşünceli"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "öntanımlı"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "denizcilik"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "Saklanmada"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "Hesap"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "Hesap sırası"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "Açıklama"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "Hata"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "bir"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "oda"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 #, fuzzy
 msgid "Unable to get issuer certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 #, fuzzy
 msgid "Unable to get certificate CRL"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 #, fuzzy
 msgid "Unable to decrypt certificate's signature"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Hata: Yanlış imza"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 #, fuzzy
 msgid "CRL signature failure"
 msgstr "Hata: Yanlış imza"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 #, fuzzy
 msgid "Certificate is not yet valid"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 #, fuzzy
 msgid "CRL has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 #, fuzzy
 msgid "Out of memory"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 #, fuzzy
 msgid "Self signed certificate"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 #, fuzzy
 msgid "Self signed certificate in certificate chain"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 #, fuzzy
 msgid "Unable to get local issuer certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 #, fuzzy
 msgid "Unable to verify the first certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Sertifika zinciri çok uzun"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 #, fuzzy
 msgid "Certificate revoked"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Geçersiz Jabber kimliği"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 #, fuzzy
 msgid "Path length constraint exceeded"
 msgstr "Kağıt Uçağın Gideceği Yol Uzunluğu"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 #, fuzzy
 msgid "Unsupported certificate purpose"
 msgstr "Sertifika doğrulama hatası (%s)"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 #, fuzzy
 msgid "Certificate not trusted"
 msgstr "GPG anahtara güvenilmiyor"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "^Rededilmiş durumunu değiştir"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 #, fuzzy
 msgid "Subject issuer mismatch"
 msgstr "ifade yığıtı uyumsuzluğu"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 #, fuzzy
 msgid "Application verification failure"
 msgstr "'%s' çözülürken geçici bozukluk"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Değer kabul edildi!"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Dosya boş"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Üyelik isteği"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Kimliksiz kimlik doğrulaması"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4758,12 +4702,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Hata açıklaması…"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4775,297 +4719,252 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "ses girdisi"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "ses çıktısı"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "video girdisi"
 
-#: gajim/common/helpers.py:226
-msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:230
-#, fuzzy
-msgid "Invalid character in hostname."
-msgstr "İpucunda geçersiz %s karakteri"
-
-#: gajim/common/helpers.py:232
-#, fuzzy
-msgid "Server address required."
-msgstr "<b>Lütfen sunucu seçiniz</b>"
-
-#: gajim/common/helpers.py:236
-msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:240
-#, fuzzy
-msgid "Invalid character in username."
-msgstr "İpucunda geçersiz %s karakteri"
-
-#: gajim/common/helpers.py:246
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
-
-#: gajim/common/helpers.py:250
-#, fuzzy
-msgid "Invalid character in resource."
-msgstr "İpucunda geçersiz %s karakteri"
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Meşgul"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Meşgul"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Mevcut Değil"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Mevcut Değil"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "Sohbet için _Hazır"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Sohbet için Hazır"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Connecting"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "_Uzakta"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Uzakta"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "Bağlı _değil"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Bağlı değil"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Bilinmez"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Hatalı"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Hiç biri"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "Kime"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Gönderen"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "İkisi de"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Unknown?OS:Bilinmez"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Hiç biri"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Üye yap"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Moderatör"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Moderatör"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Katılanlar"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Katılan"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Ziyaretçiler"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Ziyaretçi"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Hiç biri"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Sahibi"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Sahibi"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Yönetici"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Yönetici"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Üye"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Üye"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "sobete dikkat veriyor"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "başka bir şey yapıyor"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "ilet yazıyor…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "ilet yazarken durdu"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr ""
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Ileti alınıyor"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "grupdaki herkez"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " gönderen kişi %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " gönderen %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, fuzzy, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "Kişi listesindeki olayları göster"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Seni kişi listeme eklemek isterdim"
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Merhaba, benim adım $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Resimi Farklı Kaydet..."
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Resim çok büyük"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "Resimi Farklı Kaydet..."
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr ""
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 #, fuzzy
 msgid "Gajim will now exit"
 msgstr "Gajim'den gerçekten çıkılsın mı?"
@@ -5164,85 +5063,85 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Seni benim kişi listeye eklemek isterdim"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Dosya boş"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Dosya mevcut değil"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "  Spam engelleme etkin değil\n"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Durum informationu değiştir"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Durumu Değiştir"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Sohbet için Hazır"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "Çevrimiçi"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Uzun süreli uzakta"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Çevrimdışı - bağlantıyı kes"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 #, fuzzy
 msgid "Presence description:"
 msgstr "Hata açıklaması…"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 #, fuzzy
 msgid "The status has been changed."
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Kişinin bağlantısı kesildi"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kişileri eşzamana getir"
@@ -5266,7 +5165,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Hesap"
 
@@ -5277,7 +5176,7 @@ msgstr "Grup sohbetler"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Parola:"
@@ -5301,7 +5200,7 @@ msgstr "grupdaki herkez"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "_Katıl"
@@ -5319,17 +5218,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_İptal"
 
@@ -5478,7 +5377,7 @@ msgstr "Kişisel Bilgisi"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Açıklama"
 
@@ -5684,40 +5583,45 @@ msgstr "İş"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 #, fuzzy
 msgid "About"
 msgstr "Hakkında"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Grup Sohbete Katıl"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Geri Düğme"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "_Katıl"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 msgid "_Select"
 msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5786,6 +5690,7 @@ msgid "Strike"
 msgstr "Ü&stü Çizili"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Renk"
 
@@ -5798,134 +5703,129 @@ msgstr "Yazıtipi"
 msgid "Clear formatting"
 msgstr "Işareti temizle"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Parolayı Değiştir"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 msgid "Show a list of emojis (Alt+M)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 msgid "Joining…"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "Bu kişi için %s yeni bir takma ad girin."
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Takma Ad Ayarla"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "Konuk Değiştiriliyor"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Yeni parola girin: "
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Tam-Ekrandan Çık"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Tekrar dene ? [e/H] "
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Katılan"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 msgid "Reason (optional)"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Katılan"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "_Yeni Bir Grup Sohbeti"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Açıklama"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 msgid "Alternate venue (optional)..."
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Neden"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Grup %s için yeni isim giriniz: "
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "Davet _et"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-#, fuzzy
-msgid "Event Type"
-msgstr "Olay"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-#, fuzzy
-msgid "Event desc"
-msgstr "Olay"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6021,20 +5921,20 @@ msgid "Add"
 msgstr "Ekle"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "_Kaldır"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Kaynak:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Durum"
 
@@ -6044,7 +5944,7 @@ msgid "Client"
 msgstr "?Client:Bilinmez"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>Sistem:</b>"
@@ -6187,103 +6087,104 @@ msgstr "Varolan açılan penceryi _engelle"
 msgid "_Show contact list on startup"
 msgstr "Gajim açılırken bağlan"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Hesapları bir_leştir"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Kişi listesindeki olayları göster"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
 "in group chats"
 msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
 "name, in the contact list window, and in group chats"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Port numarasına göre sırala"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 #, fuzzy
 msgid "in _group chats"
 msgstr "grupdaki herkez"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Kişi listesindeki olayları göster"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Tamamlanmamış yazım denetimi kaydı"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6291,206 +6192,206 @@ msgid ""
 "Needs gspell to be installed."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "iletinin içindekiler"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Yer:"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Başlık çubuğu içeriğini sekme çubuğu etiketlerinde göster"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Başlık çubuğu içeriğini sekme çubuğu etiketlerinde göster"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Son durum: %s"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Sohbetler"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 msgid "Show _notification area icon"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Yeni olay alınca:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "_Giren kişilerden haber ver"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "_Çıkan kişilerden haber ver"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>Görsel Bildirimler</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "_Sesleri çal"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Yön_et..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Meşgulsem ses vermeye izin ver"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav Sesleri"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Mevcut Değil"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6498,7 +6399,7 @@ msgid ""
 "$T will be replaced by auto-away timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6506,231 +6407,241 @@ msgid ""
 "$T will be replaced by auto-not-available timeout."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "dakika"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Otomatik durum"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Durum ileti sor ben buysam:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "_Bağlan"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "_Çık"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Öntanımlı İlet"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 #, fuzzy
 msgid "Enabled"
 msgstr "Etkin"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "durum ileti"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Temalar"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Temalar"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Durum simgeler:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "G_PG acenta kullan"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
 "ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Biçem"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Özellikler:"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Ses çıkış aygıtı"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Ses giriş aygıtı"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Ses testi"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Video testi"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Video giriş aygıtı"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "video çıktısı"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Video testi"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Video testi"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "Bağlantı"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "STUN Sunuc:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Ses / Video"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "_Yönet..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "İşaretliyse, Gajim bu hesapının parolayı hatırlar"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Karışık</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Aç..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "İlerlemiş Ayarlama Editörü"
@@ -6908,12 +6819,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Yeni parola girin: "
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "İlerlemiş aksiyonlar"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Kendi bir makine adı/portu kullan"
@@ -6999,7 +6910,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "_Bağlan"
@@ -7013,7 +6924,7 @@ msgstr "Yeni posta yarat"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7040,8 +6951,8 @@ msgstr "Öntanımlı değerlerine geri al"
 msgid "Resets value to default"
 msgstr "Öntanımlı değerlerine geri al"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "_Bilgisayar adı:"
@@ -7084,7 +6995,7 @@ msgstr "%(nickname)s Girdi"
 msgid "Proxy Host"
 msgstr "Vekil _Makine:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Tip"
 
@@ -7097,8 +7008,7 @@ msgstr "_Protokol:"
 msgid "Copy info to clipboard"
 msgstr ""
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Özellikler:"
 
@@ -7279,6 +7189,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "Durum ileti değiştir"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Ruh Hali:</b>"
@@ -7355,8 +7270,8 @@ msgstr " [ %i%% ] (askıda)"
 
 #: gajim/data/gui/plugins_window.ui:363
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7554,81 +7469,106 @@ msgstr "Bağlantı Kurulamıyor"
 msgid "_Name"
 msgstr "_Ad:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Prox_y:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Sohbet _Başla"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Tam-Ekrandan Çık"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Paket Yöneticisi"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
+#: gajim/data/gui/application_menu.ui:22
 #, fuzzy
-msgid "Preferences"
+msgid "Pl_ugins"
+msgstr "Bağlantı Kurulamıyor"
+
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Tercihler"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Hesaplar"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "_Görünüm"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Sadece _Çecredeki Kişileri Göster"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "_Çevredışı Kişileri Göster"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Sadece _Çecredeki Kişileri Göster"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "_XML Konsolu Göster"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
+#: gajim/data/gui/application_menu.ui:60
 #, fuzzy
-msgid "XML Console"
+msgid "_XML Console"
 msgstr "_XML Konsolu Göster"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Dosya Aktarımları"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Yardım"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "Çevrimiçi"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "Çevrimiçi"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Özellikler:"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Hakkında"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7643,6 +7583,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Tam-Ekrandan Çık"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -7914,60 +7859,69 @@ msgstr "Kişi listesindeki olayları göster"
 msgid "Create new group chat"
 msgstr "Tam-Ekrandan Çık"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+#, fuzzy
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr ""
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Dosya Aktarımları"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "durum ileti"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "_XML Konsolu Göster"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>Sohbet Görünümü</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "_Çevredışı Kişileri Göster"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Sadece _Çecredeki Kişileri Göster"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Sadece _Çecredeki Kişileri Göster"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Kişisel Bilgisi"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Kişileri eşzamana getir"
@@ -8044,12 +7998,17 @@ msgstr "Formu doldur."
 msgid "Group Chat Configuration"
 msgstr "Grup Sohbeti Daveti"
 
+#: gajim/data/gui/xml_console.ui:8
+#, fuzzy
+msgid "XML Console"
+msgstr "_XML Konsolu Göster"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "Sohbet _Başla"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Filtre:"
@@ -8096,11 +8055,6 @@ msgstr "Bütün Bekleyen _Olayları Göster"
 msgid "Mute Sounds"
 msgstr "Sesi Kapat"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Tercihler"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8418,124 +8372,124 @@ msgstr "Bunu %s buna %s gönder"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Grup sohbetler"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Grup sohbetler"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Paket bulunamadı"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Grup sohbetler"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Grup sohbetler"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Grup sohbetler"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Grup Sohbeti Daveti"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "%s: OID (-o) 0 olamaz\n"
@@ -8564,7 +8518,7 @@ msgid "Sender: %s"
 msgstr "Gönderen: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Alıcı:"
 
@@ -8716,7 +8670,7 @@ msgstr "Dosya: "
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Gönderen"
 
@@ -8731,7 +8685,7 @@ msgid "Change"
 msgstr "Takma Ad Ayarla"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Geri Düğme"
@@ -8761,11 +8715,12 @@ msgid "Password Change Failed"
 msgstr "Şifre gerekli"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Aralık yeniden konumlandırılması sırasında bir hata oluştu."
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Parolayı Değiştir"
 
@@ -8800,217 +8755,212 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Devam edilen sohbet"
+msgid "Start / Join Chat"
+msgstr "Sohbet _Başla"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Grup Sohbete Katıl"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "Kişi _ekle"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s bulunamadı"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
 msgstr ""
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Diğer"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Grup sohbetler"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Hizmet Keşfi"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Hizmet bulunamadı"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr ""
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Bu hizmet gözatılabilir değil"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Geçersiz Sunucu Adı"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Göz at"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "komut"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 #, fuzzy
 msgid "Re_gister"
 msgstr "_Kaydol"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Ara"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "Düz_en"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "İndirilen dosya: %(current)li  / %(total)li"
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Üyeldi"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 #, fuzzy
 msgid "Node"
 msgstr "Ağ Sil"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Yeni posta"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Üye yap"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Üyelikten çık"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Tek bir İlet gönder"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "konu"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "%s Hesabını Kullanarak Tekli Mesaj"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Ileti cevap da içerilsin mi?"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 #, fuzzy
 msgid "Single Message"
 msgstr "Tek Bir İleti Gönder…"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Gönder %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Alındı %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 #, fuzzy
 msgid "Connection not available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr ""
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, fuzzy, python-format
 msgid "RE: %s"
 msgstr "Adı _değiştir"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, fuzzy, python-format
 msgid "%s wrote:\n"
 msgstr "Yazıldı: %s\n"
@@ -9056,89 +9006,75 @@ msgstr "Onay başarılı oldu."
 msgid "Registration failed"
 msgstr "Kayıt başarısız"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Oynatıcı için erişim türü kullanılır değil: %s\n"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "%s hesapına"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Numara:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Grup Sohbeti Daveti"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, fuzzy, python-format
 msgid "Comment: %s"
 msgstr "Yorum:"
@@ -9153,6 +9089,11 @@ msgstr "GG Numara:"
 msgid "ICQ Number"
 msgstr "ICQ Numara:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "Kişi _ekle"
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9209,7 +9150,7 @@ msgstr "Eklentilerin etkinleştirilmesinde hata #%d."
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9371,42 +9312,62 @@ msgstr "Kişinin bağlantısı kesildi"
 msgid "Contact Connected Background "
 msgstr "Kişinin bağlantısı kesildi"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "durum ileti"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "durum ileti"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "durum ileti"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "durum ileti"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Geçersiz Takma ad"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr ""
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Aktif"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Bağlantı Kurulamıyor"
@@ -9431,10 +9392,9 @@ msgid "Error: %s"
 msgstr "Hata: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Hata"
 
@@ -9448,48 +9408,48 @@ msgstr "%(nick)s durumu şimdi %(status)s"
 msgid "Status is now: %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP:"
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Yeni E-mail"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Tüm dosyalar"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Temizleniyor"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Vekil Sunuc Profili İşlet"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Prox_y:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "Durumu a_yarla"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "Bağlı değil"
@@ -9510,7 +9470,7 @@ msgstr "Hesap sırası"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "'%s' (%d) öğesi zaten bir görüntüye eklenmiş"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9542,60 +9502,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "ping:  Bağlanılan sunucuya PING at."
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "Kişileri eşzamana getir"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Ne yapmak istiyorsun?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connecting"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Okunmamış iletler var"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Geçersiz Jabber kimliği"
@@ -9651,127 +9616,127 @@ msgstr "Şükreden"
 msgid "translator-credits"
 msgstr ""
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Resim seç"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Tüm dosyalar"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Tüm dosyalar"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Gönder %s"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Resimler"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Resim seç"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Tüm dosyalar"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP:"
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "Bağlantılı"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Bağlantızıs"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "Dosya adı: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Yükleme"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Gönder"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Açıklama: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Duraklanıldı"
@@ -9780,7 +9745,7 @@ msgstr "?transfer status:Duraklanıldı"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Geçersiz Dosya"
@@ -9844,26 +9809,26 @@ msgstr "%s grup sohbete katıldı"
 msgid "Group Chat Message Received"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "Şifre gerekli"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 #, fuzzy
 msgid "No"
 msgstr "Hiçbiri"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_İptal"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -9882,11 +9847,6 @@ msgstr "%s hesapı kullanıp"
 msgid "Hide _Contact List"
 msgstr "Kişi Davet _Et"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Sadece _Çecredeki Kişileri Göster"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Menüyi gizle"
@@ -9937,35 +9897,30 @@ msgid ""
 msgstr ""
 "Kişisel ilanlar sayfayı yayınlarken bir hata çıktı, sonra bir daha prova et."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Tercihler"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 msgid "Your archiving preferences have successfully been saved."
 msgstr ""
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
+msgid "Archiving Preferences Error"
+msgstr "Tercihler"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "Komuta satrında hata: %s\n"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "Tercihler"
-
 #: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
@@ -10015,176 +9970,176 @@ msgstr "?Ask (for Subscription):Hiç biri"
 msgid "?password:Hidden"
 msgstr "Parola:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "Tercihler"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Ses / Video"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr ""
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 msgid "Feature not available under Windows"
 msgstr ""
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr ""
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Çıktı dosyası için paylaşımlı kitaplık `%s' gerekli\n"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr ""
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Python Programlama Dili"
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Dbus Denetim Altyapısı"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "Bağlantı"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr " (yetki gerektirir)"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 msgid "Feature is not available under Windows"
 msgstr ""
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Bildirimler"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr ""
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Dbus Denetim Altyapısı"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Parolayı Değiştir"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr ""
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Paket Yöneticisi"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 #, fuzzy
 msgid "Spell Checker"
 msgstr "Tamamlanmamış yazım denetimi kaydı"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr " (yetki gerektirir)"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Python Programlama Dili"
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Tercihler"
@@ -10231,7 +10186,7 @@ msgstr "Geçersiz Liste İsmi"
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Kişi Davet _Et"
@@ -10259,7 +10214,7 @@ msgstr "_Bitir"
 msgid "Commands"
 msgstr "komut"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10332,120 +10287,134 @@ msgstr "Dosya Gönderme Soru"
 msgid "Loading"
 msgstr "Kodlamada"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "Bağlantılı"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Aralık yeniden konumlandırılması sırasında bir hata oluştu."
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Bu hesabın parolyı değiştirmek için tikla"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connecting"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Dalga %s biçimini desteklemiyor..."
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Dalga %s biçimini desteklemiyor..."
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "ping:  Bağlanılan sunucuya PING at."
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "Kişi _ekle"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Yeni posta yarat"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "url portu bir sayı olmalı\n"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 msgid "Port must be a number between 0 and 65535"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "İlerlemiş aksiyonlar"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "ben burdaysam"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Bunu %s buna %s gönder"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Hesap sırası"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "'%s' (%d) öğesi zaten bir görüntüye eklenmiş"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Hesaplar"
@@ -10488,247 +10457,251 @@ msgstr "Ara"
 msgid "No results found"
 msgstr "<b>Telefon numara:</b>"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 #, fuzzy
 msgid "status message title"
 msgstr "Durum ileti değiştir"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 #, fuzzy
 msgid "status message text"
 msgstr "Durum ileti değiştir"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Paket sisteminin kilitli olup olmadığını kontrol edin."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Paket sisteminin kilitli olup olmadığını kontrol edin."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "ping:  Bağlanılan sunucuya PING at."
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 #, fuzzy
 msgid "Label"
 msgstr "etiket"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kişi Davet _Et"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "%(nickname)s Girdi"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Gajim açılırken bağlan"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Her kişinin sohbet _kaydını kaydet"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Bütün durumlar"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Durum satırı okunamadı"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Dosya aktarım vekil sunucları kullan"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Üye olduğu süre:"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kişi Davet _Et"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 msgid "Ignore everything from contacts not in your Roster"
 msgstr ""
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Ön_celik:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Durum satırı okunamadı"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "İlk Ad:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Soy Ad:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Yeni E-mail"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Durumu a_yarla"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 #, fuzzy
 msgid "Enable"
 msgstr "Etkin"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Porta:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Bağlantı"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "%(nickname)s Girdi"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Parolayı Değiştir"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Bağlantı Kurulamıyor"
@@ -10777,19 +10750,19 @@ msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Kişileri eşzamana getir"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Bilinmeyen Sanatçı"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Bilinmeyen Parça"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Bilinmeyen Kaynak"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10801,22 +10774,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Yer imi"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "Dosya boş"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Karalı servisin TXT verisi"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -10873,126 +10846,216 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Bütün Bekleyen _Olayları Göster"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Özellikler:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Kişiler"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Grup sohbetler"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Son Kullanılan:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Bağlantı Kurulamıyor"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Devam edilen sohbet"
+
+#, fuzzy
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "<b>Bir hata oluştu:</b>"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#, fuzzy
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "Denetimler arasındaki süre %lu saniye olarak belirleniyor\n"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Oynatıcı için erişim türü kullanılır değil: %s\n"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Yeniden bağlan"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Sadece _Çecredeki Kişileri Göster"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "Kişi _ekle"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Kişi Davet _Et"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Tam-Ekrandan Çık"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "_Yeni Bir Grup Sohbeti"
+
+#, fuzzy
+#~ msgid "Invalid character in hostname."
+#~ msgstr "İpucunda geçersiz %s karakteri"
+
+#, fuzzy
+#~ msgid "Server address required."
+#~ msgstr "<b>Lütfen sunucu seçiniz</b>"
+
+#, fuzzy
+#~ msgid "Invalid character in username."
+#~ msgstr "İpucunda geçersiz %s karakteri"
+
+#, fuzzy
+#~ msgid "Invalid character in resource."
+#~ msgstr "İpucunda geçersiz %s karakteri"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "_Giren kişilerden haber ver"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "_Çıkan kişilerden haber ver"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Dosya Gönderme Tamamlandı"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "_Bir dosya aktarımı tamamlandığında beni bilgilendir"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "_Bir dosya aktarımı tamamlandığında beni bilgilendir"
+
+#, fuzzy
+#~ msgid "Event Type"
+#~ msgstr "Olay"
+
+#, fuzzy
+#~ msgid "Event desc"
+#~ msgstr "Olay"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Kaynak Çarpışması"
 
@@ -11505,10 +11568,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "Yeni kişisel Mesaj"
 
 #, fuzzy
-#~ msgid "Send _File"
-#~ msgstr "_Dosya Gönder…"
-
-#, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Katılanlar"
 
@@ -11650,10 +11709,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "Bug'ları hallet"
 
 #, fuzzy
-#~ msgid "Configure Services…"
-#~ msgstr "Çevrimiçi Servisler"
-
-#, fuzzy
 #~ msgid "Group Chat Bookmarks"
 #~ msgstr "Grup Sohbetler"
 
@@ -13084,10 +13139,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr " [ %i%% ] (askıda)"
 
 #, fuzzy
-#~ msgid "Plugins updates"
-#~ msgstr "Bağlantı Kurulamıyor"
-
-#, fuzzy
 #~ msgid "cyan"
 #~ msgstr "turkuaz"
 
@@ -13178,10 +13229,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "Durumu a_yarla"
 
 #, fuzzy
-#~ msgid "Requires gnome-network-manager"
-#~ msgstr "Paket Yöneticisi"
-
-#, fuzzy
 #~ msgid "Bookmark this room (Ctrl+B)"
 #~ msgstr "Bu odayi yer imle"
 
@@ -13396,9 +13443,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ "değişterebilirsin.\n"
 #~ "Belki halka ayarları değiştirmeye üzerinde düşünürsün."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Hesapları bir_leştir"
-
 #, fuzzy
 #~ msgid "Account Name Already Used"
 #~ msgstr "Benim _kullanmak istediyim bir hesapım var bile"
diff --git a/po/uk.po b/po/uk.po
index fe3d8cb6a..61caaddd7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.0.1-2fa5ddcd1adf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2013-08-30 12:04+0300\n"
 "Last-Translator: Sergiy Yegorov <prapor@unixzone.org.ua>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
@@ -19,67 +19,73 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "Облікові записи"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "і НЕ уповноваженим"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s шифрування увімкнено %(authenticated)s."
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr "_Скасувати"
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr "_Очистити"
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "Вибрати зображення"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Ви збираєтесь закрити кілька вкладок"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 "Ви справді бажаєте вставити зображення з буфера обміну до вікна балачки?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "Більше _не питати мене"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "Список конфіденційності"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 msgid "Warning"
 msgstr "Попередження"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
@@ -87,7 +93,7 @@ msgstr ""
 "Якщо ви надішлете файл — <b>%s</b> дізнається про ваш справжній "
 "ідентифікатор Jabber."
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "_Продовжити"
 
@@ -156,224 +162,220 @@ msgstr "У черзі немає запитів на підписку."
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "Показувати _від’єднані контакти"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "Я хочу додати вас до мого списку контактів."
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "Надіслати окреме _повідомлення"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Ви_конати команду"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "Пере_йменувати"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Розблокувати"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Заблокувати"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "В_илучити"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Інформація"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
-msgid "Send File…"
-msgstr "Надіслати файл…"
+#: gajim/gui_menu_builder.py:517
+#, fuzzy
+msgid "Send File"
+msgstr "Надіслати _файл"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "Зберегти файл як..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Зберегти файл як..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Попередній стан: %"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "Запросити _контакти"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
-msgstr "_Додати контакт..."
+msgid "Add to Contact List…"
+msgstr "Додати контакт..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "Запит на голосову розмову"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "Тест відео"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "_Інформація"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "_Журнал"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "Вимкнено"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "Лише друк"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "Усі стани балачок"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "Запросити _контакти"
+msgid "All Chat States"
+msgstr "Усі стани балачок"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "Полишити групові балачки"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "Полишити групові балачки"
-
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
-msgid "Change Subject"
-msgstr "Змінити _тему..."
+msgid "Rename…"
+msgstr "Пере_йменувати"
 
-#: gajim/gui_menu_builder.py:579
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Configure Group Chat"
-msgstr "Полишити групові балачки"
+msgid "Change Subject…"
+msgstr "Змінити _тему..."
 
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 msgid "Upload Avatar…"
 msgstr "Вивантажити аватар…"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "Створити групову балачку"
+msgid "Configure…"
+msgstr "Налаштувати"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "Знищення %s"
+
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Гарячі клавіші"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "_Показати зміни стану"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "Зразки повідомлень:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "_Мінімізувати після закриття"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "Мінімізувати після автоматичного приєднання"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "Змінити _псевдонім..."
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Запит голосу"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "Ви_конати команду"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -381,264 +383,267 @@ msgstr[0] "%i день"
 msgstr[1] "%i дні"
 msgstr[2] "%i днів"
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "Лише друк"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "Усі стани балачок"
+
+#: gajim/gui_menu_builder.py:671
 msgid "Add Contact…"
 msgstr "Додати контакт..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 msgid "Profile"
 msgstr "Профіль"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "Надіслати окреме повідомлення…"
 
-#: gajim/gui_menu_builder.py:676
-msgid "Discover Services"
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Discover Services…"
 msgstr "Переглянути служби"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "Додатково"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 msgid "Archiving Preferences"
 msgstr "Налаштування архівації"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "Список заборон"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Закладка"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "Налаштування"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
-msgid "Synchronise History"
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "Synchronise History…"
 msgstr "Синхронізувати історію"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "_Адміністратор"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Надіслати серверне повідомлення..."
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Встановити «Повідомлення дня»..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Оновити «Повідомлення дня»..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Вилучити «Повідомлення дня»"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "_Додати контакт..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "_Змінити обліковий запис"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "_Змінити обліковий запис"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "_Копіювати JID/адресу електронної пошти"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Приєднатись до групової балачки"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "Додати контакт..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Копіювати посилання"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Відкрити посилання у веб-переглядачі"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Копіювати JID/адресу електронної пошти"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Відкрити редактор поштових повідомлень"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Копіювати посилання"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "Положення:"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "_Копіювати JID/адресу електронної пошти"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "_Запросити"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "_Розблокувати"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "_Заблокувати"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "_Викинути"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "_Заблокувати"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "Власник"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "_Адміністратор"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "Учасник"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "Учасник"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "_Запит голосу"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "JID кімнати"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 msgid "Usage:"
 msgstr "Використання:"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 msgid "Options:"
 msgstr "Опції:"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr "Показати цю довідку та вийти"
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "Не можу знайти базу даних журналу"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, python-format
 msgid "%s does not exist."
 msgstr "Файла %s не існує."
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "Адреса AIM:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -646,28 +651,28 @@ msgstr "Дата"
 msgid "Nickname"
 msgstr "Псевдонім"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Повідомлення"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "Тема"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "Очищення бази даних"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "створення бази даних кешу"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -681,28 +686,28 @@ msgstr ""
 "\n"
 "Якщо ви натиснете кнопку «ТАК», вам доведеться зачекати..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "Споро_жнити"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "Ви"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s повідомив: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Вилучити"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -710,7 +715,7 @@ msgstr[0] "Підтвердження видалення"
 msgstr[1] "Підтвердження видалення"
 msgstr[2] "Підтвердження видалення"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
@@ -718,7 +723,7 @@ msgstr[0] "Ви справді бажаєте незворотньо видал�
 msgstr[1] "Ви справді бажаєте незворотньо видалити ці перемовини?"
 msgstr[2] "Ви справді бажаєте вилучити виділене повідомлення?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -726,7 +731,7 @@ msgstr[0] "Типове повідомлення"
 msgstr[1] "Типове повідомлення"
 msgstr[2] "Типове повідомлення"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
@@ -734,145 +739,145 @@ msgstr[0] "Ви справді бажаєте вилучити виділене
 msgstr[1] "Ви справді бажаєте вилучити виділені повідомлення?"
 msgstr[2] "Ви справді бажаєте вилучити виділені повідомлення?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Назва контакту: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "Загальне"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "Група"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "У групі"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "Встановити настрій"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "Немає"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "Повідомлення про стан %s"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "Повідомлення про стан"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 #, fuzzy
 msgid "Overwrite"
 msgstr "Перезаписати?"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "Перезаписати повідомлення про стан?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Перезаписати?"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "Повідомлення про стан"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "Зберегти як зразок..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "Будь ласка, введіть назву цього повідомлення про стан"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "Зберегти _як"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "Стан"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Назва"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
 "з’єднано з сервером."
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "аудіо та відео"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "аудіо"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "відео"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
@@ -881,95 +886,99 @@ msgstr ""
 "%(contact)s бажають розпочати %(type)s розмову з вами. Ви бажаєте відповісти "
 "на запит?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+msgid "Send File…"
+msgstr "Надіслати файл…"
+
+#: gajim/groupchat_control.py:411
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Надіслати файл (макс. %s МіБ)…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Перенесення файлу не вдалося"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "Некоректний файл"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "Викидання %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "Список заборон"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "Запит на голосову розмову"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 #, fuzzy
 msgid "_Approve"
 msgstr "підтвердити"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s встановив тему %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "Цей сеанс БУДЕ збережена на сервері"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "Відомості про вас, які зберігаються на сервері"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
@@ -984,7 +993,7 @@ msgstr "Га! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Га! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "Помилка."
 
@@ -1013,22 +1022,22 @@ msgstr "Було створено нову кімнату"
 msgid "Failed to Configure Group Chat"
 msgstr "Полишити групові балачки"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} тепер стає {new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Ви тепер {show} {status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} тепер {show} {status}"
@@ -1157,80 +1166,80 @@ msgid "If you close this window, you will leave '%s'."
 msgstr ""
 "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки «%s»."
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s було запрошено до цієї кімнати"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "Показати список інструментів форматування"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 msgid "This contact does not support HTML"
 msgstr "Цей контакт не підтримує HTML"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Гу?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Га! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s стан : %(state)s, причина: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групової балачки %(room_name)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "_Надіслати і закрити"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "Нове повідомлення"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "_Надіслати і закрити"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1239,184 +1248,175 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s тепер %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Перенесення файлів"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "Розмір"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "_Прийняти"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Поза мережею"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "В_ідкриту теку, яка містить цей файл"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Віддалений контакт зупинив передавання файлу"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Помилка під час спроби прочитати файл"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "Зупинка передавання файла"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "Передавання файла скасовано"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "Не вдалося встановити з’єднання з вузлом."
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Показувати піктограму зони сповіщень"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 msgid "Show only critical errors"
 msgstr "_Показати лише критичні помилки"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Показувати повідомлення xml та іншу відлагоджувальну інформацію"
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 msgid "Use defined profile in configuration directory"
 msgstr "Використовувати призначений профіль у каталозі налаштувань"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "Призначити конфігураційний каталог"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "Налаштувати ведення журналів"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показати усі _події з черги"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr ""
 "Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Почати балачку"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "Транспорти"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "Групові балачки"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Було надіслано уповноваження"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Уповноваження було вилучено"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
@@ -1426,7 +1426,7 @@ msgstr "Тепер «%s» завжди бачитиме вас як «поза �
 msgid "desynced"
 msgstr "розсинхронізація"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1446,7 +1446,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "Завжди закривати Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
@@ -1605,8 +1606,8 @@ msgstr "Перейменувати групу"
 msgid "Please enter a new name"
 msgstr "Будь ласка, спершу створіть нову порожню тему з бажаною назвою."
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "Пере_йменувати"
@@ -1625,29 +1626,34 @@ msgstr "Бажаєте вилучити групу %s з реєстру?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "Полишити групові балачки"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Перейменувати контакт"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Вилучає контакт з реєстру"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "Ви збираєтесь вилучити \"%(name)s\" (%(jid)s) з вашого реєстру.\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1656,21 +1662,21 @@ msgstr ""
 "Вилучаючи цей контакт ви також відкликаєте авторизацію, тобто тепер вас "
 "бачитимуть як поза мережею."
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Вилучає контакт з реєстру"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1683,26 +1689,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Перейменувати контакт"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1710,12 +1716,12 @@ msgstr ""
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1726,21 +1732,21 @@ msgstr ""
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Перейменувати контакт"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Творчий"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
@@ -1748,100 +1754,101 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "_Надіслати"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Надіслати %s до %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "Зробити %s першим контактом."
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Робить %s та %s метаконтактом."
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "Оприлюднити положення"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "За_просити до"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редагувати _групи"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "В_илучити"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "Пере_йменувати"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "_Перез’єднати"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "Ви_конати команду"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "_Журнал"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Спостерігачі"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1972,70 +1979,70 @@ msgstr "Конфіденційні балачки"
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "Чи приймаєте ви цей запит?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "Було надіслано уповноваження"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "Було надіслано уповноваження"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "Ні"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "Запит на підписку"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2044,149 +2051,149 @@ msgstr ""
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "_Непідписаний"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s відхилив запрошення: %(reason)s"
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s відхилив запрошення"
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Вас запрошено до {room} від {user}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "Потрібна кодова фраза для сертифікату"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Введіть пароль ключа GPG для сертифікату від облікового запису %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Віддалений контакт зупинив передавання файлу"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Помилка під час спроби прочитати файл"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Помилка сертифіката SSL"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 msgid "File Transfer Failed"
 msgstr "Перенесення файлу не вдалося"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s невдале"
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s невдале"
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Надсилання файлу %(filename)s до %(name)s невдале."
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s бажає розпочати голосову розмову."
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "Запит на голосову розмову"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "Небезпечне з’єднання"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2198,20 +2205,20 @@ msgstr ""
 "незашифрованим. Цей тип з’єднання справді ненадійний. \n"
 "Ви справді бажаєте це зробити?"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "Виконується з'єднання"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2419,11 +2426,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "Спроба оприлюднення vCard зазнала невдачі"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "Спроба надсилання конфіденційного повідомлення зазнала невдачі"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2759,28 +2766,23 @@ msgstr ""
 "Не було вказано аргумент \"%(arg)s\". \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s є каталогом, а має бути файлом"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Знищення %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Невідома помилка SSL: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
@@ -2788,50 +2790,50 @@ msgstr[0] "Нове повідомлення від %(nickname)s"
 msgstr[1] "Нове повідомлення від %(nickname)s"
 msgstr[2] "Нове повідомлення від %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "Створити групову балачку"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змінив стан"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s тепер %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s в мережі"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s вийшов з мережі"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
@@ -2910,65 +2912,23 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "Сповіщати мене про в_хід контактів до мережі"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "Сповіщати мене про в_ихід контактів з мережі"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "Колір сповіщення про новий лист або повідомлення"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "П_овідомити мене про завершення передавання файлу"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "П_овідомити мене про завершення передавання файлу"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "Колір контактів, які тільки-но увійшли до мережі."
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Список (відокремлених комами) рядків (облікових записів і груп), які буде "
 "згорнуто."
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "типовий"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "Мова, яку використовуватиме інструмент перевірки правопису"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2978,15 +2938,15 @@ msgstr ""
 "'sometimes' — виводити час кожні print_ichat_every_foo_minutes хвилин.\n"
 "'never' — ніколи не виводити час."
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Вважати пари символів * / _ символами форматування."
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
@@ -2995,7 +2955,7 @@ msgstr ""
 "Якщо має значення «True», не вилучати */_ . Наприклад, рядок *abc* "
 "вважатиметься рядком з напівжирним шрифтом після вилучення позначок * *."
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
@@ -3004,7 +2964,7 @@ msgstr ""
 "Символ, який буде додано після псевдоніма, якщо ви використовуєте "
 "автоматичне доповнення псевдоніма (tab) у груповій балачці."
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
@@ -3013,7 +2973,7 @@ msgstr ""
 "Символ, який буде запропоновано додати після бажаного псевдоніма, якщо "
 "псевдонім буде використано кимось з групової балачки."
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 #, fuzzy
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
@@ -3022,11 +2982,11 @@ msgstr ""
 "Якщо увімкнено, Gajim буде зберігати положення вікна ховаючи реєстр та "
 "відновлювати при його показі."
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -3039,24 +2999,24 @@ msgstr ""
 "\"[година:хвилина] \". Див. документацію з python щодо strftime, щоб "
 "дізнатися більше: http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "Символи, які буде показано перед псевдонімами під час спілкування"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "Символи, які буде показано після псевдонімів під час спілкування"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні "
 "реєстру"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
@@ -3065,12 +3025,12 @@ msgstr ""
 "Кількість рядків тесту, які слід запам’ятати з попереднього спілкування для "
 "показу під час повторного відкриття вкладки або вікна балачки."
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -3080,19 +3040,19 @@ msgstr ""
 "конференції від якої вас було від’єднано. Встановіть 0 для блокування "
 "автоматичного перепід’єднання."
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Надсилати повідомлення за Ctrl+Enter, а за допомогою Enter розривати рядок "
 "(типова поведінка клієнта Mirabilis ICQ)."
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Кількість рядків, які слід зберігати для Ctrl+Стрілка_вгору."
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3101,13 +3061,13 @@ msgstr ""
 "Або нетипова адреса url з підрядком %s, де %s — слово або фраза, або "
 "'WIKTIONARY' (це означає, що слід використовувати службу wiktionary)."
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Якщо позначено цей пункт, Gajim можна віддалено керувати за допомогою gajim-"
 "remote."
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
@@ -3116,15 +3076,15 @@ msgstr ""
 "Якщо не вказано, що програма має виводити час для кожного з повідомлень "
 "(print_time==sometimes), виводити час кожні x хвилин."
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "Запитувати перед закриттям вкладки або вікна групової балачки."
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3134,7 +3094,7 @@ msgstr ""
 "до втрати даних (діалог, приватний діалог, групова розмова що не може бути "
 "мінімізована)."
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3144,32 +3104,32 @@ msgstr ""
 "інтерфейсів, для передавання файлів у випадку трансляції адрес або "
 "переспрямування портів."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Згідно до стандарту IEC: кіБ = 1024 байтам, кБ = 1000 байтам."
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "Сповіщення про події у зоні сповіщень."
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "Показувати вкладку за умови єдиної бесіди?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показувати бічну панель з вкладками у вікнах балачки?"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "Показувати кнопку закриття на вкладці?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr ""
 "Здійснювати попередній перегляд нових повідомлень у виринаючому сповіщенні?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
@@ -3178,7 +3138,7 @@ msgstr ""
 "Список відокремлених крапкою з комою слів, які буде виділено у групових "
 "балачках."
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3189,23 +3149,13 @@ msgstr ""
 "кнопки з позначкою «X» у менеджері вікон. Цей параметр братиметься до уваги, "
 "лише якщо використовується піктограма лотка."
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"Якщо має значення «True», Gajim показуватиме певну піктограму на кожній з "
-"вкладок, на якій містяться непрочитані повідомлення. Залежно від обраної "
-"вами теми, піктограму може бути анімовано."
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3215,13 +3165,13 @@ msgstr ""
 "про стан, якщо це повідомлення не буде порожнім, для кожного з контактів під "
 "іменем контакту у вікні реєстру."
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Визначає позицію аватару у реєстрі. Можливі значення: left і right"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3231,26 +3181,26 @@ msgstr ""
 "рядок стану у балачках, коли контакт змінює свій стан і/або своє "
 "повідомлення про стан."
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "Не показувати реєстр на системній панелі задач."
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3260,7 +3210,7 @@ msgstr ""
 "GTK+ і PyGTK не старіші за 2.8, у разі наявності подій у черзі позначка "
 "вікна програми почне блимати (типова поведінка у більшості менеджерів вікон)."
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3282,7 +3232,7 @@ msgstr ""
 "'pertype' — повідомлення буде розподілено за типом (наприклад, прості і "
 "групові балачки) між окремими вікнами."
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3295,36 +3245,36 @@ msgstr ""
 "'never' - Ніколи не показувати реєстр.\n"
 "'last_state' - Відновити останній стан реєстру.ртсик"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні "
 "балачки."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Якщо цей параметр матиме значення «True», натискання клавіші escape "
 "закриватиме вкладку або вікно програми."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "Приховує підпис у вікні групової балачки"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "Приховує підпис у вікні групової балачки"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "Ховає список учасників групової балачки у вікні групової балачки."
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3333,12 +3283,12 @@ msgstr ""
 "У балачках, показувати псевдонім на початку рядка повідомлення, лише якщо це "
 "повідомлення не тої самої особи, якою було надіслано попереднє повідомлення."
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Відступ за використання об’єднання послідовних повідомлень від однієї особи."
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
@@ -3347,7 +3297,7 @@ msgstr ""
 "Ctrl-Tab переводить до наступної вкладки створення повідомлення, якщо немає "
 "непрочитаних."
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
@@ -3356,7 +3306,7 @@ msgstr ""
 "Чи слід показувати діалогове вікно підтвердження блокування контактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
@@ -3365,7 +3315,7 @@ msgstr ""
 "Чи слід показувати діалогове вікно підтвердження блокування контактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3377,7 +3327,7 @@ msgstr ""
 "облікового запису. БУДЬТЕ ОБЕРЕЖНІ за умови входу з від’ємним пріоритетом: у "
 "такому разі ви НЕ отримуватимете повідомлень від вашого сервера."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
@@ -3387,7 +3337,7 @@ msgstr ""
 "контактів у мережі і загальну кількість контактів у рядках облікових записів "
 "і груп."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3397,11 +3347,11 @@ msgstr ""
 "у ньому контакт, яким вам було надіслано останнє повідомлення, якщо вікно "
 "балачки ще не було відкрито."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Час відсутності активності потрібний для закриття вікна зміни стану."
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3409,13 +3359,7 @@ msgstr ""
 "Максимальна кількість рядків, які буде показано протягом спілкування. "
 "Застарілі рядки понад вказане число вилучатимуться."
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr ""
-"Оберіть інтервал між двома послідовними перевірками на відсутність "
-"активності."
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3424,7 +3368,7 @@ msgstr ""
 "Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
 "(mailto і xmpp обробляються окремо)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
@@ -3432,23 +3376,23 @@ msgstr ""
 "Якщо Істино, доповнення у групових балачках будуть схожі на автодоповнення "
 "командної оболонки."
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Опціонально виправляти частоту кадрів вихідного відео Jingle. Приклад: 10/1 "
 "або 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Опціонально змінювати розмір вихідного відео Jingle. Приклад: 320х240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3458,12 +3402,12 @@ msgstr ""
 "використано значення параметру \"stun_server\", або отримане з серверу "
 "Jabber."
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "Сервер STUN для використання з Jingle"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
@@ -3472,19 +3416,19 @@ msgstr ""
 "Якщо увімкнено, Gajim покаже членство учасників балачки додаванням "
 "кольорового квадрату до піктограми стану."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 #, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr "Проксі що використовується для усіх вихідних з’єднань не налаштовано"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 #, fuzzy
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr "Якщо «Так», Gajim буде ігнорувати вхідні запити уваги (\"wizz\")."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3492,7 +3436,7 @@ msgstr ""
 "Якщо активовано, Gajim буде повторно відкривати вікна балачок, що були "
 "відкриті минулого разу."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
@@ -3501,11 +3445,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати піктограму про "
 "отримання повідомлення вашим співрозмовником."
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
@@ -3513,37 +3453,37 @@ msgstr ""
 "Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
 "Keyring (за його наявності) для зберігання паролі облікових записів."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
@@ -3552,7 +3492,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
 "час"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
@@ -3561,7 +3501,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
 "час"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
@@ -3570,7 +3510,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
 "час"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3579,7 +3519,7 @@ msgstr ""
 "Надсилати сповіщення про стан балачки. Може мати значення all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3588,28 +3528,32 @@ msgstr ""
 "Надсилати сповіщення про стан балачки. Може мати значення all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "Зробити закладку на цій кімнаті"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
@@ -3618,7 +3562,7 @@ msgstr ""
 "Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети "
 "визначаються за допомогою параметрів autopriority_*."
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3629,18 +3573,18 @@ msgstr ""
 "значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр "
 "використовуватиметься, лише якщо вимкнено параметр restore_last_status"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "Якщо увімкнено, відновлювати попередній використаний стан."
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr "Якщо Істино, усі запити авторизації буде автоматично задоволено."
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
@@ -3649,12 +3593,12 @@ msgstr ""
 "Якщо цей параметр матиме значення «False», обліковий запис буде вимкнено та "
 "не буде відображатись у вікні реєстру."
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -3663,15 +3607,15 @@ msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати пароль звичайним "
 "текстом. Може бути 'поперджати', 'з’єднувати', 'відключати'"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
@@ -3682,7 +3626,7 @@ msgstr ""
 "журнали. Ви можете також додати назву облікового запису для якого не буде "
 "вестись журналювання."
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
@@ -3692,7 +3636,7 @@ msgstr ""
 "пакет підтримування зв’язку, перш ніж розпочати процедуру повторного "
 "з’єднання."
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3702,7 +3646,7 @@ msgstr ""
 "проксі сервери, визначення параметром file_transfer_proxies, для передавання "
 "файлів."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 #, fuzzy
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
@@ -3712,30 +3656,30 @@ msgstr ""
 "старті, щоб переконатись у їх працездатності. Openfire не проходить цей тест "
 "навіть якщо працездатний."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати піктограму про "
 "отримання повідомлення вашим співрозмовником."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Дозволити Gajim надсилати інформацію, яку операційну систему ви "
 "використовуєте"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "Дозволятии Gajim надсилати ваш локальний часд"
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "Повідомлення що буде надіслано контакту який ви бажаєте додати"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3744,7 +3688,7 @@ msgstr ""
 "Якщо увімкнено, Gajim надішле ваш локальний IP щоб контакт міг з’єднатись та "
 "надіслати вам файли."
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 #, fuzzy
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
@@ -3753,21 +3697,17 @@ msgstr ""
 "Розділений пробілами перелік ідентифікаторів JID для яких ви хочете "
 "відкривати вікно балачки при наступному запуску."
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 msgid "Allow certificate verification with POSH."
 msgstr "Перевірка сертифіката SSL за допомогою POSH."
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
@@ -3776,41 +3716,41 @@ msgstr ""
 "Надсилати сповіщення про стан балачки. Може мати значення all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "Увімкнути шифрування ESession для цього облікового запису."
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
@@ -3819,7 +3759,7 @@ msgstr ""
 "Надсилати сповіщення про стан балачки. Може мати значення all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3830,84 +3770,84 @@ msgstr ""
 "виході з Gajim). Ця опція НЕ ПОВИННА бути використана для (де)активації "
 "додатків. Використовуйте для цього графічний інтерфейс користувача."
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "Їм"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "Я працюю."
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "Відео"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "Працюю"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "Пока!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3917,1049 +3857,1049 @@ msgstr ""
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 msgid "Tor"
 msgstr "Tor"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Помилка: не вдалося відкрити %s для читання"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "Групові балачки"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "Виділення повідомлення групової балачки:"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "Запрошення до групової балачки"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "Запрошення до групової балачки"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "_Групова балачка"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "Групові балачки"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "Можливість створення групових балачок обмежено."
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "Створити групову балачку"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "Не вдалося знайти службу"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 msgid "Address does not belong to a group chat server"
 msgstr "Адреса не належить серверові групових балачок"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "Обліковий запис Local вже існує."
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 msgid "Group chat does not exist"
 msgstr "Групової балачки не існує."
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "Історія групових балачок"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "Займаюся повсякденною роботою"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "Закуповую бакалію"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "Прибираю"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "Куховарю"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "Роблю ремонт"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "Мию посуд"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "Перу"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "Займаюся садівництвом"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "У відрядженні"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "Вигулюю собаку"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "Випиваю"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "П’ю пиво"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "П’ю каву"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "П’ю чай"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "Їм"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "Снідаю"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "Вечеряю"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "Обідаю"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "Вправляюся"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "Катаюся на велосипеді"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "Танцюю"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "Займаюся туризмом"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "Бігаю підтюпцем"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "Граю у спортивні ігри"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "Бігаю"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "Катаюся на лижах"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "Займаюся плаванням"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "Ладнаю справи"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "Доглядаю за конем"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "На гідромасажі"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "Чищу зуби"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "Стрижуся"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "Голюся"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "Приймаю вану"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "Приймаю душ"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "На побаченні"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "Вихідний"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "Тиняюся"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "Ховаюся"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "У відпустці"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "Молюся"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "Запланований вихідний"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "Думаю"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "Розслабляюся"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "Рибалю"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "Граюсь"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "Гуляю"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "Бере участь у вечірці"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "Читаю"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "Репетирую"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "Роблю закупи"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "Курю"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "Спілкуюся"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "Засмагаю"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "Дивлюся телевізор"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "Дивиться кіно"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "Розмовляю"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "У реальному житті"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "Розмовляю телефоном"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "Розмовляю відеотелефоном"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "Подорожую"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "Їду на роботу або з роботи"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "Веду машину"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "У автомобілі"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "У автобусі"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "На літаку"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "У поїзді"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "У мандрах"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "На прогулянці"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "Програмую"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "На зустрічі"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "Вчуся"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "Пишу"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "Зляканий"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "Зачарований"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "Закоханий"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "Злий"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "Роздратований"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "Стривожений"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "Збуджений"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "Засоромлений"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "Знудьгований"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "Безстрашний"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "Спокійний"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "Обережний"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "Незворушний"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "Впевнений"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "Збентежений"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "Задумливий"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "Задоволений"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "Недужий"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "Шалений"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "Творчий"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "Допитливий"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "Пригнічений"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "Пригнічений"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "Розчарований"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "Відражений"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "Нажаханий"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "Зніяковілий"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "Стурбований"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "Сповнений заздрощів"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "Захоплений"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "Кокетливий"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "Зневірений"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "Дуже вдячний"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "Засмучений"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "Сердитий"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "Винний"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "Щасливий"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "Сповнений надій"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "Гарячий"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "Скромний"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "Принижений"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "Голодний"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "Поранений"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "Вражений"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "Пригнічений величчю"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "Закоханий"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "Обурений"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "Зацікавлений"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "Отруєний"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "Невидимий"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "Заздрісний"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "Одинокий"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "Втрачений"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "Щасливий"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "Жалюгідний"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "Смутний"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "Знервований"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "Нейтральний"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "Ображений"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "Обурений"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "Грайливий"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "Гордий"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "Розслаблений"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "Врятований"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "Співчутливий"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "Нетерплячий"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "Сумний"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "Саркастичний"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "Вдоволений"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "Серйозний"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "Шокований"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "Сором’язливий"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "Хворий"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "Сонний"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "Непередбачуваний"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "Напружений"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "Сильний"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "Здивований"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "Вдячний"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "Спраглий"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "Втомлений"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "Непевний"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "Слабкий"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "Занепокоєний"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr "точність"
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 msgid "alt"
 msgstr "висота"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr "зона"
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 msgid "bearing"
 msgstr "пеленг"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 msgid "building"
 msgstr "будівля"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 msgid "country"
 msgstr "країні"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 msgid "countrycode"
 msgstr "код країни"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr "характеристика"
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 msgid "description"
 msgstr "опис"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 msgid "error"
 msgstr "помилка"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr "поверх"
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr "широта"
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr "місцевість"
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 msgid "lon"
 msgstr "довгота"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr "поштовий індекс"
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr "регіон"
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "кімната"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr "швидкість"
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 msgid "street"
 msgstr "вулиця"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr "текст"
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr "мітка часу"
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "Не вдається отримати сертифікат видавця"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "Не вдалося отримати список відкликаних сертифікатів"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "Не вдалося розшифрувати підпис сертифікату"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "Не вдалося розшифрувати підпис списку відкликаних сертифікатів"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "Не вдалося декодувати відкритий ключ видавця"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "Помилка під час підписування сертифіката"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "Помилка під час роботи з підписом списку відкликаних сертифікатів"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "Сертифікат ще не набув чинності"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "Строк дії сертифікату завершився!"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "Строк дії CRL ще не почався"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "Строк дії CRL завершився"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "Помилка форматування у полі сертифіката notBefore"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "Помилка форматування у полі сертифіката notAfter"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Помилка форматування у полі сертифіката lastUpdate"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Помилка форматування у полі сертифіката nextUpdate"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "Не вистачає пам'яті"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "Сертифікат є самопідписаним"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопідписаний сертифікат у ланцюжку сертифікатів"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "Не вдалося отримати сертифікат локального видавця"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "Не вдалося перевірити перший сертифікат"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "Ланцюжок сертифіката занадто великий"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "Сертифікат відкликано"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "Некоректний сертифікат CA"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "Перевищення обмеження на довжину адреси"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "Непідтримуване призначення сертифіката"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "Сертифікат є недостовірним"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "Сертифікат відхилено"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Видано для іншого призначення"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Не збігаються поля видавця та ідентифікатора призначення ключа"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серійні номери служби сертифікації і видавця не збігаються"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "До призначення ключа не належить підписування сертифікатів"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "Сертифікат відкликано"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "Невідома помилка SSL: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "Строк дії сертифікату завершився!"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "Уповноваження прийнято"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "Обліковий запис вимкнено"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "Облікові дані Oauth2"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "Запит на підписку"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "Додаток не підтримується"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -5021,12 +4961,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s помилка конфігурації"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -5045,223 +4985,190 @@ msgstr ""
 "Помилка:\n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "аудіо вхід"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "аудіо вихід"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "відео вхід"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "Сервер має бути від 1 до 1023 символів"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "Некоректний символ у назві вузла."
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "Слід вказати адресу сервера."
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "Ім’я користувача повинно бути від 1 до 1023 символів"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "Некоректний символ у імені користувача."
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "Ресурс має бути від 1 до 1023 символів"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "Некоректний символ у назві ресурсу."
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "_Зайнятий"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "_Не доступний"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "Дуже далеко"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "_Вільний для балачки"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "Вільний для балачки"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "?стан користувача:_Доступний"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "?стан користувача:Доступний"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "Виконується з'єднання"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "В_ідійшов"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "Далеко"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "_Поза мережею"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "?стан контакту:Невідомий"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "?стан контакту:З помилками"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "?Підписка яку ми вже маємо:Жодної"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "До"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Від"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Обидва"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "?ОС:Невідома"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "?Запит (на підписку):Немає"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "Підписатися"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "Модератори"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "Учасники"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "Учасник"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "Відвідувачі"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "Відвідувач"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Членство контакту у груповій балачці:Жодного"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "Власник"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "Власник"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "Адміністратор"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "Адміністратор"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "Учасник"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Учасник"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "спілкується"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "робить щось інше"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише повідомлення..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "призупинив (призупинила) створення повідомлення"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "закрив (закрила) вікно або вкладку балачки"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5269,22 +5176,22 @@ msgstr[0] "у черзі %d повідомлення"
 msgstr[1] "у черзі %d повідомлення"
 msgstr[2] "у черзі %d повідомлень"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, python-format
 msgid "from group chat %s"
 msgstr "у групових балачках %s"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " від користувача %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " від %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5292,48 +5199,37 @@ msgstr[0] "у черзі %d подія"
 msgstr[1] "у черзі %d події"
 msgstr[2] "у черзі %d подій"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "Я хочу додати вас до мого списку контактів."
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "Привіт, я $name."
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "Перевищення часу очікування під час завантаження зображення"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "Зображення є завеликим"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 msgid "PyCURL is not installed"
 msgstr "PyCURL не встановлено"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 msgid "Error loading image"
 msgstr "Помилка завантаження зображення"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s є файлом, а має бути каталогом"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Зараз Gajim завершить роботу"
 
@@ -5440,83 +5336,83 @@ msgstr "Комп’ютер присипляється"
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "Файл порожній"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "Файла не існує"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "Шифрування E2E вимкнено"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "Змінити відомості про стан"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "Змінити стан"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "Вказати тип присутності і опис"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "Вільний для балачки"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "В мережі"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "Не буде довго"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "Не турбувати"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "Поза мережею — від’єднаний"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "Опис стану присутності:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "Стан було змінено."
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Відправлений контакт:  \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "Надіслати контакти:"
 
@@ -5539,7 +5435,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "Обліковий запис"
 
@@ -5550,7 +5446,7 @@ msgstr "Групові балачки"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -5574,7 +5470,7 @@ msgstr "у _групових балачках"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "При_єднатися"
@@ -5593,17 +5489,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "_Скасувати"
 
@@ -5751,7 +5647,7 @@ msgstr "Контактна інформація"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "Опис"
 
@@ -5949,39 +5845,44 @@ msgstr "Робота"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "Відомості"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "Приєднатись до групової балачки"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "Скоро повернуся"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "При_єднатися"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 msgid "Select Account"
 msgstr "Виберіть обліковий запис"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "Прибираю"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -6051,6 +5952,7 @@ msgid "Strike"
 msgstr "Перекреслити"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Колір"
 
@@ -6063,137 +5965,133 @@ msgstr "Шрифт"
 msgid "Clear formatting"
 msgstr "Зняти форматування"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Оберіть клієнтський сертифікат"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Показати список емоційок (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "Блокування..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 msgid "Enter new nickname"
 msgstr "Введіть новий псевдонім"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "Змінити _псевдонім..."
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+msgid "Change Subject"
+msgstr "Змінити _тему..."
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "Введіть новий пароль:"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "Полишити групові балачки"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде приєднуватись до цієї групової "
 "балачки після запуску"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>Сталася помилка:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "Повторити перевірку..."
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "Учасник"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "_Викинути"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "Учасник"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "_Заблокувати"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "Створити групову балачку"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "Знищення %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "Підстава"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "Введіть нову назву для групи %s"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "_Запросити"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "Тип події"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "Опис події"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6289,20 +6187,20 @@ msgid "Add"
 msgstr "Додати"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "В_илучити"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "Стан"
 
@@ -6311,7 +6209,7 @@ msgid "Client"
 msgstr "Клієнт"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "Система"
 
@@ -6451,38 +6349,39 @@ msgstr "Пов_едінка вікна:"
 msgid "_Show contact list on startup"
 msgstr "_Показувати реєстр при старті:з"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "Об’є_днати облікові записи"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "Показувати _аватари контактів у реєстрі"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6491,12 +6390,12 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати аватари контактів у "
 "вікні реєстру і групових балачках"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "Показувати _повідомлення  про стан контактів з реєстру"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6505,7 +6404,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати повідомлення про стан "
 "під ім'ям контакту у вікні реєстру і групових балачках"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
@@ -6513,47 +6412,47 @@ msgstr ""
 "Показувати _розширену інформацію про контакт у реєстрі (настрій, діяльність, "
 "тощо)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "Впорядкувати контакти за станом"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "Надіслати контакти:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "у _групових балачках"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "Обмін елементами реєстру"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "Перевірка правопису"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6566,29 +6465,29 @@ msgstr ""
 "контекстного меню (клацання правою кнопкою миші), буде використано типову "
 "мову для контакту або групової балачки."
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "вміст повідомлення"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "Показати список інструментів форматування"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "Показувати _повідомлення  про стан контактів з реєстру"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6598,58 +6497,58 @@ msgstr ""
 "рядок стану у балачках, коли контакт змінює свій стан і/або своє "
 "повідомлення про стан."
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "Гарячі клавіші"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "_Показати зміни стану"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "Показувати кнопку закриття на вкладці?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
@@ -6658,113 +6557,116 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
 "час"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "Показувати кнопку закриття на вкладці?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
 msgstr ""
+"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
+"час"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "Попередній стан: %"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "Балачки"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "Показувати піктограму зони сповіщень"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "Якщо отримано нову подію:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr ""
 "Дозволити сповіщення у разі встановленого стану в_ідійшов/зайнятий/тощо"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr ""
 "Дозволити сповіщення у разі встановленого стану в_ідійшов/зайнятий/тощо"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "Сповіщати мене про в_хід контактів до мережі"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "Сповіщати мене про в_ихід контактів з мережі"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "Візуальні сповіщення"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "Відтворювати _звуки"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "Ке_рування..."
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "Дозволити звуки у стані _зайнятий."
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Звуки wav"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "Сповіщення"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "Дуже далеко"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
@@ -6773,7 +6675,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim змінюватиме стан на «Недоступний», якщо "
 "на комп’ютері не спостерігатиметься активності користувача довше, ніж"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
@@ -6782,7 +6684,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim змінюватиме стан на «Недоступний», якщо "
 "на комп’ютері не спостерігатиметься активності користувача довше, ніж"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 msgid ""
 "The automatic away status message. If empty, the current status message will "
 "not be changed.\n"
@@ -6794,7 +6696,7 @@ msgstr ""
 "$S буде замінено на попереднє повідомлення.\n"
 "$T буде замінено на час автоматичного повідомлення про відсутність."
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 msgid ""
 "The automatic not available status message. If empty, the current status "
 "message will not be changed.\n"
@@ -6806,40 +6708,40 @@ msgstr ""
 "$S буде замінено на попереднє повідомлення.\n"
 "$T буде замінено на час автоматичного повідомлення про недоступність."
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "хвилин"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "Узгодити зі станом"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "Запитувати щодо повідомлення про стан, якщо я:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "Уві_йти"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "Вий_ти"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -6847,65 +6749,65 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim не запитуватиме про повідомлення стану. "
 "Програма використовуватиме вказане типове повідомлення."
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "Типове повідомлення"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "Повідомлення про стан"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "Зразки повідомлень про стан"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "Тема"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "Тема"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "Налаштувати шрифт та колір інтерфейсу"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 msgid "_Dark Theme"
 msgstr "_Темна тема"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 msgid "_Emoji Theme"
 msgstr "_Тема емоційок"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "Набір _піктограм стану:"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "Використовувати піктограми _транспортів"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6915,75 +6817,75 @@ msgstr ""
 "протоколу піктограми станів. (Приклад: для контактів MSN будуть використані "
 "відповідні піктограми msn для станів «в мережі», «відсутній» тощо)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "Стиль"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "Можливості"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "Пристрій відтворення звуку"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "Пристрій введення звуку"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "Тест аудіо"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "Тест відео"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "Пристрій введення відео"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "відео вихід"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "Частота кадрів відео"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "Розмір відео"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 #, fuzzy
 msgid "Vi_ew own video source"
 msgstr "Подивитись власне відео"
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "З'єднання"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "Сервер STUN:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
@@ -6992,53 +6894,63 @@ msgstr ""
 "Ім’я серверу STUN. Якщо нічого не вказано\n"
 "Gajim спробує отримати значення з серверу."
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "Аудіо/Відео"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 #, fuzzy
 msgid "_Global proxy"
 msgstr "Глобальний проксі:"
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "Керування..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "_Записувати зміни стану контактів"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового "
 "запису"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "Різне"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "_Відкрити..."
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "Редактор додаткових налаштувань"
@@ -7215,12 +7127,12 @@ msgstr ""
 msgid "Your password"
 msgstr "Введіть новий пароль:"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "Додаткові дії"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "Використовувати інші вузол/порт"
@@ -7306,7 +7218,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "Уві_йти"
@@ -7320,7 +7232,7 @@ msgstr "Будь ласка, спершу створіть нову порожн
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7347,8 +7259,8 @@ msgstr "_Скинути до типових"
 msgid "Resets value to default"
 msgstr "_Скинути до типових"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "Назва _вузла:"
@@ -7390,7 +7302,7 @@ msgstr "Перегляд сертифікату..."
 msgid "Proxy Host"
 msgstr "Проксі-_вузол:"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "Тип"
 
@@ -7404,8 +7316,7 @@ msgstr "П_ротокол:"
 msgid "Copy info to clipboard"
 msgstr "_Копіювати посилання"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "Можливості"
 
@@ -7592,6 +7503,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "_Змінити повідомлення про стан"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Настрій:</b>"
@@ -7668,9 +7584,10 @@ msgid "Installed"
 msgstr "Встановлено"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr ""
 "Тут має бути показано опис додатка. Цей текст буде видалено при "
 "ініціалізації вікна додатків."
@@ -7857,79 +7774,107 @@ msgstr "Гарячі клавіші"
 msgid "_Name"
 msgstr "_Назва:"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "Прокс_і:"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "Почати балачку"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "Полишити групові балачки"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "Керування журналом"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "Додатки"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "Параметри"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "Облікові записи"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "П_ерегляд"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "Показувати лише _активні контакти"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "Показувати _від’єднані контакти"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "Показувати лише _активні контакти"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "Показувати транс_порти"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "Консоль XML"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "Перенесення файлів"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "_Довідка"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "В мережі"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "В мережі"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+#, fuzzy
+msgid "_Keyboard Shortcuts"
 msgstr "Гарячі клавіші"
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "Можливості"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "Відомості"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7944,6 +7889,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Полишити групові балачки"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8236,59 +8186,67 @@ msgstr "Гарячі клавіші"
 msgid "Create new group chat"
 msgstr "Полишити групові балачки"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "Параметри"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "Додатки"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "Перенесення файлів"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "повідомлення про стан"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "Показати _XML-консоль"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "Вигляд"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "Показувати _від’єднані контакти"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "Показувати лише _активні контакти"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "Показувати лише _активні контакти"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "Контакти"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "Контактна інформація"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "Перейменувати контакт"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "Надіслати контакти:"
@@ -8365,12 +8323,16 @@ msgstr "Заповніть форму."
 msgid "Group Chat Configuration"
 msgstr "Запрошення до групової балачки"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "Консоль XML"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "_Почати балачку..."
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "Фільтр:"
@@ -8416,11 +8378,6 @@ msgstr "Показати усі _події з черги"
 msgid "Mute Sounds"
 msgstr "Вимкнути звук"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "Параметри"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8759,123 +8716,123 @@ msgstr "%(progress)s з %(total)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 msgid "Anyone can join this group chat"
 msgstr "Хто завгодно може приєднатися до цієї групової балачки"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "Виділення повідомлення групової балачки:"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "Групові балачки"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "Виділення повідомлення групової балачки:"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "Групові балачки"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "Виділення повідомлення групової балачки:"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "Не вдалося знайти службу"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "Групові балачки"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "Групові балачки"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "Групові балачки"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "Запрошення до групової балачки"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "Цей сеанс БУДЕ збережена на сервері"
@@ -8904,7 +8861,7 @@ msgid "Sender: %s"
 msgstr "Відправник: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "Отримувач:"
 
@@ -9058,7 +9015,7 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Надсилання порожніх файлів не передбачено"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "Відправник:"
 
@@ -9073,7 +9030,7 @@ msgid "Change"
 msgstr "Змінити _псевдонім..."
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "Скоро повернуся"
@@ -9104,11 +9061,12 @@ msgid "Password Change Failed"
 msgstr "Слід ввести пароль"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "Під час спроби створення облікового запису сталася помилка"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "Змінити пароль"
 
@@ -9146,41 +9104,36 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "Невідома помилка SSL: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "Спілкування з продовженням"
+msgid "Start / Join Chat"
+msgstr "Почати балачку"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Додати контакт..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s не знайдено"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "Ця служба ще не надала докладних відомостей"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9189,34 +9142,34 @@ msgstr ""
 "Ця служба не може надсилати у відповідь докладні відомості.\n"
 "Причиною є застарілість або пошкодженість служби"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "Інші"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "Групові балачки"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Для того, щоб переглядати доступні служби, вам слід встановити з’єднання"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук служб за допомогою облікового запису %s"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "Пошук у службі"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "Не вдалося знайти службу"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -9224,142 +9177,142 @@ msgstr ""
 "За вказаною вами адресою служб не виявлено, або ця адреса не відповідає. "
 "Перевірте, чи правильно вказано адресу, а потім повторіть спробу."
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "Служба не придатна для перегляду"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "Служби такого типу не містять елементів, які можна було б переглядати."
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "Некоректна назва сервера"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Перегляд %(address)s з використанням облікового запису %(account)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "_Перегляд"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "Ця служба не містить жодних елементів, які можна було б переглядати."
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "команда"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "За_реєструватися"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "_Пошук"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "_Правка"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Пошук %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "Користувачі"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Ідентифікатор"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "Підписано"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "Вузол"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "Нове повідомлення"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "_Підписатися"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "Надіслати окреме повідомлення"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "тема"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, python-format
 msgid "Characters typed: %s"
 msgstr "Уведені символи: %s"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "Неможливо надіслати повідомлення до %s, вказаний JID не є коректним."
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
@@ -9406,30 +9359,12 @@ msgstr "Реєстрація вдала"
 msgid "Registration failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "Словники для мови %s не доступні"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Вам слід встановити словник %s, щоб мати змогу користуватися перевіркою "
-"правопису або обрати іншу мову за допомогою параметра speller_language.\n"
-"\n"
-"Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "Клієнтський сертифікат"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
@@ -9438,65 +9373,65 @@ msgstr ""
 "Сертифікат до облікового запису\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Номер GG:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "застаріти"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Запрошення до групової балачки"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 "<b>%(contact)s</b> запрошує вас до групової балачки <b>%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -9511,6 +9446,11 @@ msgstr "Номер GG:"
 msgid "ICQ Number"
 msgstr "Номер ICQ:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Додати контакт..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9565,7 +9505,7 @@ msgstr "Помилка під час додавання служби."
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9725,30 +9665,50 @@ msgstr "Контакт від'єднано"
 msgid "Contact Connected Background "
 msgstr "Контакт з'єднано"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "Повідомлення про стан"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "Повідомлення про стан"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "Повідомлення про стан"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "Повідомлення про стан"
+
+#: gajim/gtk/themes.py:187
 msgid "Gajim Themes"
 msgstr "Теми Gajim"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "Некоректний псевдонім"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "Заборонений символ"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "Ви справді бажаєте вилучити виділене повідомлення?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
@@ -9756,12 +9716,12 @@ msgid ""
 msgstr ""
 "Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "Активний"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "Додатки"
@@ -9785,10 +9745,9 @@ msgid "Error: %s"
 msgstr "Помилка: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "Помилка."
 
@@ -9802,48 +9761,48 @@ msgstr "Поточний стан: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Поточний стан: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "Всі файли"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "Прибираю"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Керування профілями проксі"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "Прокс_і:"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "_Узгодити зі станом"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr "Увімкнено"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "Вимкнено"
 
@@ -9863,7 +9822,7 @@ msgstr "Стрічка облікового запису"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "Ваш новий обліковий запис було успішно створено"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9894,60 +9853,64 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+msgid "Synchronise History"
+msgstr "Синхронізувати історію"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "Що ви хочете зробити?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "Виконується з'єднання"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s з %(max)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "Завантажено %s повідомлень"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "Jabber/XMPP клієнт, що базується на GTK+"
@@ -10006,125 +9969,125 @@ msgstr "Вдячний"
 msgid "translator-credits"
 msgstr "Сергій Єгоров"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Вибрати файл для надсилання..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "Вибрати архів"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "Всі файли"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "Всі файли"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "Надіслати _файли"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "Зображення"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "Вибрати архів"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Файли ZIP"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "Зберегти файл як..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s цієї групової балачки"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "З'єднано"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "Роз'єднано"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 msgid "File Name: "
 msgstr "Назва файлу:"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "Звантажити"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "Вивантажити"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "Зупинка передавання файла"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "Призупинено"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "Призупинено"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "Опис: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "Призупинено"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "Призупинено"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "Призупинено"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "Призупинено"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "Призупинено"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "Призупинено"
@@ -10133,7 +10096,7 @@ msgstr "Призупинено"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Некоректний файл"
@@ -10188,25 +10151,25 @@ msgstr "Виділення повідомлення групової балач�
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "вимагати"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Так"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "Ні"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Скасувати"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10225,11 +10188,6 @@ msgstr "з облікового запису %s"
 msgid "Hide _Contact List"
 msgstr "Запросити _контакти"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "Показувати лише _активні контакти"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "Сховати це меню"
@@ -10277,35 +10235,30 @@ msgid ""
 msgstr ""
 "Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Архівація налаштувань для %s"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "Налаштування архівації"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "Налаштування архівації збережено!"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "Ваш комп’ютер не з’єднано з сервером"
+msgid "Archiving Preferences Error"
+msgstr "Налаштування архівації"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "Отримано помилку: {}"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "Налаштування архівації"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Увімкнено"
@@ -10354,60 +10307,60 @@ msgstr "?Запит (на підписку):Немає"
 msgid "?password:Hidden"
 msgstr "Пароль:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "Налаштування архівації"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "Аудіо/Відео"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "Можливість розпочати аудіо та відео розмову."
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "Цією можливістю не можна скористатися у Windows."
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
@@ -10416,21 +10369,21 @@ msgstr ""
 "Можливість вимірювання часу відсутності активності для встановлення "
 "автоматичного стану."
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "Потрібна бібліотека libxss."
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
@@ -10439,103 +10392,103 @@ msgstr ""
 "Балачка, для якої не потрібен сервер, з автоматичним виявленням клієнтів у "
 "локальній мережі."
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "Потрібен python-gupnp-igd."
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "Вимагає pybonjour та bonjour SDK (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "З'єднання"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "Потрібна бібліотека libgtkspell."
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "Цією можливістю не можна скористатися у Windows."
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "Сповіщення"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "Можливість розпочати аудіо та відео розмову."
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "Потрібен python-dbus."
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "Зберегти пароль"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "Можна зберігати паролі безпечно, не лише як звичайний текст."
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "Потрібні gnome-keyring і python-gnome2-desktop, або kwalletcli."
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "Перевірка правопису"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "Потрібна бібліотека libgtkspell."
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 #, fuzzy
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 "Можливість запиту до маршрутизатора для надання порту для передавання файлів."
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "Потрібен python-gupnp-igd."
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "Налаштування архівації"
@@ -10582,7 +10535,7 @@ msgstr "Некоректна назва списку"
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "Запросити _контакти"
@@ -10610,7 +10563,7 @@ msgstr "_Завершити"
 msgid "Commands"
 msgstr "команда"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10682,119 +10635,133 @@ msgstr "Запит на підписку від %s"
 msgid "Loading"
 msgstr "Завантаження"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "З'єднано"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "Вилучення облікового запису %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "Натисніть. щоб змінити пароль цього облікового запису"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Виконується з'єднання"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "Ваш сервер не підтримує Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "Заборонений символ"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "Ваш сервер не підтримує Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "_Додати контакт..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "Створити нове повідомлення"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "Ресурс має бути від 1 до 1023 символів"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Додаткові дії"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "Попередження"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "Невідома помилка SSL: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "Вилучення облікового запису"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "Зареєструватися на %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "Стрічка облікового запису"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "Обліковий запис було успішно додано"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "Облікові записи"
@@ -10837,255 +10804,259 @@ msgstr "Пошук"
 msgid "No results found"
 msgstr "Результату немає"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "Типовий"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "заголовок повідомлення про стан"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "текст повідомлення про стан"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "Повторно увійти зараз?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "Повторно увійти зараз?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
 "облікового запису, а потім знову туди увійти."
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Будь ласка, переконайтеся, що встановлено Avahi або Bonjour."
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Будь ласка, переконайтеся, що встановлено Avahi або Bonjour."
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "Некоректний обліковий запис"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr ""
 "Всі вікна балачок і групових балачок буде закрито.\n"
 "Бажаєте продовжити процедуру виходу?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Некоректний обліковий запис"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 #, fuzzy
 msgid "Label"
 msgstr "мітка"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Запросити _контакти"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "Клієнтський сертифікат"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_З'єднуватись після запуску Gajim"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Зберігати _журнал спілкування для усіх контактів"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "Усі стани"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "Використовувати проксі передавання файлів"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "Відсутній з:"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Клієнтський сертифікат"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr ""
 "Дозволити Gajim надсилати інформацію, яку операційну систему ви "
 "використовуєте"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Запросити _контакти"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ігнорувати події від контактів поза реєстром"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "Пріорите_т:"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "використовувати змінну середовища HTTP_PROXY"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "Ім'я:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "Прізвище:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "Нове повідомлення електронної пошти"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Узгодити зі станом"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 #, fuzzy
 msgid "Enable"
 msgstr "Увімкнено"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "З'єднання"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "Клієнтський сертифікат"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "Файли PKCS12"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Cертифікат"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Cертифікат"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "Зберегти пароль"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "Додатки"
@@ -11138,19 +11109,19 @@ msgstr[0] "Вилучено %d контакт"
 msgstr[1] "Вилучено %d контакти"
 msgstr[2] "Вилучено %d контактів"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "Невідомий виконавець"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "Невідома назва"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "Невідоме джерело"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11164,20 +11135,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "_Закладка"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "Архів пошкоджено"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "Архів порожній "
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "Архів пошкоджений"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Додаток вже встановлено"
@@ -11233,126 +11204,247 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "Показати усі _події з черги"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "Можливості"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "Перевірка правопису повідомлень, які ви створюєте."
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
 msgstr "Підтримка пошуку служб включно з вузлами та пошуком користувачів"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "Контакти"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "Групові балачки"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "Нещодавно:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "Активація додатка невдалаДодаток"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "Спілкування з продовженням"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "Невідома помилка SSL: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr ""
+#~ "Оберіть інтервал між двома послідовними перевірками на відсутність "
+#~ "активності."
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "Словники для мови %s не доступні"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Вам слід встановити словник %s, щоб мати змогу користуватися перевіркою "
+#~ "правопису або обрати іншу мову за допомогою параметра speller_language.\n"
+#~ "\n"
+#~ "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Перез’єднати"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "Показувати лише _активні контакти"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "_Додати контакт..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "Запросити _контакти"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "Полишити групові балачки"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "Створити групову балачку"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "Якщо має значення «True», Gajim показуватиме певну піктограму на кожній з "
+#~ "вкладок, на якій містяться непрочитані повідомлення. Залежно від обраної "
+#~ "вами теми, піктограму може бути анімовано."
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "Сервер має бути від 1 до 1023 символів"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "Некоректний символ у назві вузла."
+
+#~ msgid "Server address required."
+#~ msgstr "Слід вказати адресу сервера."
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "Ім’я користувача повинно бути від 1 до 1023 символів"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "Некоректний символ у імені користувача."
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "Ресурс має бути від 1 до 1023 символів"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "Некоректний символ у назві ресурсу."
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "Сповіщати мене про в_хід контактів до мережі"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "Сповіщати мене про в_ихід контактів з мережі"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "Колір сповіщення про новий лист або повідомлення"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "П_овідомити мене про завершення передавання файлу"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "П_овідомити мене про завершення передавання файлу"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "Колір контактів, які тільки-но увійшли до мережі."
+
+#~ msgid "Event Type"
+#~ msgstr "Тип події"
+
+#~ msgid "Event desc"
+#~ msgstr "Опис події"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "Ваш комп’ютер не з’єднано з сервером"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "Конфлікт ресурсів"
 
@@ -12018,9 +12110,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "_Send Private Message"
 #~ msgstr "_Надіслати конфіденційне повідомлення"
 
-#~ msgid "Send _File"
-#~ msgstr "Надіслати _файл"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "Учасники"
@@ -14899,9 +14988,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ "ваших налаштувань, ви можете налаштувати інший.\n"
 #~ "Можливо, вам також доведеться змінити параметри брандмауера."
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Об’є_днати облікові записи"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "На цьому комп'ютері OpenPGP не придатне для використання"
 
@@ -15482,9 +15568,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Потрібен python-gnome2."
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "Потрібні gnome-keyring і python-gnome2-desktop, або kwalletcli."
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 29d38988b..a2399853b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2010-10-31 17:37+0800\n"
 "Last-Translator: Guanhao Yin <yinguanhao@gmail.com>\n"
 "Language-Team: \n"
@@ -20,74 +20,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "账户"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "且已被认证"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "且未被认证"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s 加密已启用%(authenticated)s。"
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "选择图像"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "您将要关闭多个标签"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "您确定要离开聊天室\"%s\"吗?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "不再询问(_D)"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "隐私策略列表"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "将封禁 %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "如果您想向 %s 发送文件, 对方会获知您的真实JID。"
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -145,496 +151,491 @@ msgstr "没有未处理的认证请求"
 msgid " resource with priority "
 msgstr " 带有优先级的资源 "
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "显示离线联系人"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "我想添加您到我的联系人列表"
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 msgid "Send Single _Message…"
 msgstr "发送单条(_M)…"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "执行命令(_E)..."
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "管理代理(_M)"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "重命名(_R)"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "解除屏蔽(_U)"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "屏蔽(_B)"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "移除(_R)"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "信息(_I)"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "发送文件(_F)"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "另存为..."
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "另存为..."
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "最后状态"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "邀请联系人(_C)"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "添加联系人(_A)..."
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "语音聊天请求"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "视频测试"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "信息(_I)"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "历史(_H)"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "禁用"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "仅正在编辑"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "所有聊天状态"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "邀请联系人(_C)"
+msgid "All Chat States"
+msgstr "所有聊天状态"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "离开聊天室"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "离开聊天室"
+msgid "Rename…"
+msgstr "重命名(_R)"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "更改主题(_S)"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "离开聊天室"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "选择归档文件"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "新聊天室"
+msgid "Configure…"
+msgstr "配置"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "正在销毁 %s"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "插件"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "记录联系人状态变化(_L)"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "预设的消息: "
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "关闭时最小化窗口"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "自动加入时最小化"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "更改昵称(_N)"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "语音(_V)"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "执行命令(_E)..."
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "仅正在编辑"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "所有聊天状态"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "添加联系人(_A)..."
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "文件"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 msgid "Send Single Message…"
 msgstr "发送单条消息…"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "发现服务(_D)"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "服务器"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "高级"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "编辑存档首选项(_V)"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "封禁名单"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "将本聊天室加入书签(_B)"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "聊天室设置"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "同步"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "隐私策略列表"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "管理(_A)"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "发送服务器消息(_S)"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "设定 MOTD..."
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "更新 MOTD..."
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "删除 MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "添加联系人(_A)..."
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "修改账户信息(_M)"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "修改账户信息(_M)"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "账户"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "复制 JID/电子邮件地址(_C)"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 msgid "Join Groupchat"
 msgstr "加入聊天室"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "添加联系人(_A)..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "复制链接位置(_C)"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "复制 JID/电子邮件地址(_C)"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "打开邮件编辑器(_O)"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "复制链接位置(_C)"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "位置："
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "复制 JID/电子邮件地址(_C)"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "邀请(_V)"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "解除屏蔽(_U)"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "屏蔽(_B)"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "踢除(_K)"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "封禁(_B)"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "所有者"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "管理(_A)"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "成员"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "成员"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "语音(_V)"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "聊天室 JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "message"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "表情(_E): "
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "文件不存在"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM 地址: "
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "日期"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -642,29 +643,29 @@ msgstr "日期"
 msgid "Nickname"
 msgstr "昵称"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "消息"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "主题"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "数据库错误"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "建立缓存数据库"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -676,278 +677,283 @@ msgstr ""
 "\n"
 "如果您点击\"是\", 请等待..."
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "清除(_U)"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "您"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说: %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "删除"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "删除确认"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "您确定要删除所选定的消息？"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "默认消息"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "您确定要删除所选定的消息？"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "联系人名称: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "常规"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "群组"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "群组内"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "设置 Mood"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "无"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr "%s 状态信息"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "状态信息"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 msgid "Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "覆盖状态信息?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "这个名称已被使用。您想要覆盖这个状态信息吗?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "状态信息"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "另存为..."
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "请为这个状态信息输入一个名称"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "另存为(_A)"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "状态"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未连接时，您不能同步您的联系人。"
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "名称"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "服务器"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "这个账户已经连接到服务器"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "这个账户连接后您才可以与之同步"
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "同步"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "一个音频和视频"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "一个音频"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "一个视频"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s 想要与您发起一个 %(type)s 会话。您要响应吗?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "发送文件(_F)"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "另存为..."
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "文件传输完毕"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "无效文件"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "将踢走 %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "封禁名单"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "语音聊天请求"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 #, fuzzy
 msgid "_Approve"
 msgstr "approve"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s 将主题设置为 %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "聊天室现在显示了不可用的成员"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "聊天室现在不显示禁止的成员"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "本次会话将在服务器上被存档"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "服务器中保存的关于您的信息"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "聊天室现在是非匿名的"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "聊天室现在是半匿名的"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "聊天室现在是完全匿名的"
@@ -962,7 +968,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "错误。"
 
@@ -991,22 +997,22 @@ msgstr "一个新的聊天室被创建"
 msgid "Failed to Configure Group Chat"
 msgstr "离开聊天室"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} 现在改名为{new_nick}"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "您现在成了{show}{status}"
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} 的状态是 {show}{status}"
@@ -1132,81 +1138,81 @@ msgstr "您确定要离开聊天室\"%s\"吗?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "如果关闭此窗口, 您将断开此聊天室的连接。"
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s 已经被邀请加入该聊天室"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "显示格式列表(Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "这个联系人不支持文件传输"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 状态: %(state)s, 原因: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "聊天室 %(room_name)s 的 %(nickname)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "忽略这个证书的这个错误。"
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "您刚刚收到一条来自 \"%s\" 的消息"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "发送并关闭(_S)"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "新消息"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "发送并关闭(_S)"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1215,182 +1221,173 @@ msgstr ""
 "主题: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s 的状态是 %(show)s %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "文件传输"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 msgid "Size"
 msgstr "大小"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "帐户(_A)"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "离线(_O)"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "打开文件夹(_O)"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "聊天室邀请"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "远程联系人停止了传输"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "打开文件错误"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "文件传输已停止"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "文件传输已取消"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "在通知区域显示图标: "
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "只显示在联系人列表中"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "高级设置编辑器"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 msgid "Set configuration directory"
 msgstr "设置配置文件目录"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 msgid "Configure logging system"
 msgstr "配置日志系统"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 msgid "Show all warnings"
 msgstr "显示所有警告"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr "打开 IPython shell"
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "为下一条未处理事件弹出窗口"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "开始新聊天"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "数据库错误"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "服务代理"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "聊天室"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "授权发送成功"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "现在\"%s\"将知道您的状态。"
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "如果\"%s\"接受此请求, 您将知道他/她的状态。"
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "授权被移除"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 将一直看到您的状态为离线。"
@@ -1400,7 +1397,7 @@ msgstr "\"%s\" 将一直看到您的状态为离线。"
 msgid "desynced"
 msgstr "未同步"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1420,7 +1417,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "总是关闭 Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
@@ -1569,8 +1567,8 @@ msgstr "重命名群组"
 msgid "Please enter a new name"
 msgstr "请用您想要的名字新建一个主题。"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "重命名(_N)"
@@ -1589,48 +1587,53 @@ msgstr "您想从联系人列表中删除组 %s ?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "同时从联系人列表删除这个群组的所有联系人"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "离开聊天室"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "请在您本地账户填写新的用户名"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "重命名联系人"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "从联系人列表删除联系人"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "您将从您的联系人列表中将 \"%(name)s\" (%(jid)s) 移除。\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr "删除此联系人的同时将删除认证，这将导致对方一直看到您为离线。"
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "您要继续吗?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "从联系人列表删除联系人"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1639,24 +1642,24 @@ msgid ""
 "%s"
 msgstr "删除此联系人的同时将删除认证，这将导致对方一直看到您为离线。"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "重命名联系人"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持存储元联系人信息"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1664,12 +1667,12 @@ msgid ""
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时不会被保存。"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "您在创建一个元联系人。确定继续?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1679,119 +1682,120 @@ msgstr ""
 "元联系人是将几个联系人组合起来显示在同一行。通常在某个人有几个XMPP 账户或代理"
 "账户时用到。"
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "重命名联系人"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "创造"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "无效的文件地址: "
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "您想要将文件发送给 %s 吗: "
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "发送 %s 给 %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "将 %s 设为第一联系人"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "使用 %(contact1)s 与 %(contact2)s 创建元联系人"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "更改状态信息(_C)"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "发布音乐"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "发布位置信息"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "最大化全部(_M)"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "向所有在线用户"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "管理联系人(_M)"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 msgid "Edit _Groups…"
 msgstr "编辑群组(_G)…"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "最大化(_M)"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "重命名(_N)"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "重新连接(_R)"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "执行命令(_E)..."
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "历史(_H)"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "历史记录管理器"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "旁观者"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1919,70 +1923,70 @@ msgstr "私聊"
 msgid "Messages"
 msgstr "消息"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 认证"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "是否接受这个对账户 %s 的请求?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "授权发送成功"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "授权发送成功"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "No"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %(message)s 时出现错误( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "认证请求"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "联系人\"%s\"已授权您查看他/她的状态。"
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "认证请求"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "联系人\"%s\"移除了对您的关注"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -1991,149 +1995,149 @@ msgstr ""
 "您将一直看到对方处于离线状态。\n"
 "要将对方从您的联系人列表中移除吗?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "已取消认证的"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "您被 {user}邀请到聊天室 {room}"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "证书已过期"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "输入账户 %s 的证书密码。"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "需要密码"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "保存密码"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "远程联系人停止了传输"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "打开文件错误"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL证书错误"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "文件传输完毕"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "请在您本地账户填写新的用户名"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要发起语音聊天。"
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "语音聊天请求"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "不安全的连接"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2144,20 +2148,20 @@ msgstr ""
 "对话都不会被加密。强烈建议您不要这么做。\n"
 "您确定要这样做吗？"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "正在连接"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2358,11 +2362,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard 发布失败"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已离开。"
@@ -2685,77 +2689,72 @@ msgstr ""
 "参数 \"%(arg)s\" 未指定。\n"
 "输入 \"%(basename)s help %(command)s\" 获取更多信息"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一个目录但它应该是一个文件"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "正在销毁 %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "未知的 SSL 错误: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "新个人消息"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "来自 %(nickname)s 的新消息"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "新聊天室"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 改变了状态"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上线了"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 离开了"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "\"%s\"登录验证失败"
@@ -2823,63 +2822,21 @@ msgstr ""
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "提醒我联系人登录(_I)"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "提醒我联系人登出(_O)"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "在弹出提示中预览消息?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "文件传输完成时提醒我(_N)"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "文件传输完成时提醒我(_N)"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "状态变更通知的背景色"
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "折叠的行(账户和组)的列表(空格分隔)。"
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "默认"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "拼写检查的语言"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2889,46 +2846,46 @@ msgstr ""
 "'有时' - 如 iChat 风格每隔几分钟显示时间。\n"
 "'从不' - 从不显示时间。"
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "将成对出现的 * / _ 视为可能的格式控制字符。"
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
 msgstr "如果为真, 则不要移除 */_。这样 *abc* 将被加粗，但是* * 不会被去除。"
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr "当在聊天室中使用昵称补全(Tab)时加到昵称后的字符。"
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr "当请求的昵称被聊天室中的其他人使用时加到请求的昵称后的字符。"
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr ""
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2940,34 +2897,34 @@ msgstr ""
 "钟]\"。请参考Python文档关于strftime的完整文档:http://docs.python.org/lib/"
 "module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "在对话中显示在昵称前的字符"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "在对话中显示在昵称后的字符"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的心情。"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
 msgstr "聊天标签/窗口被重新打开时显示之前进行的对话的最后多少行。"
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
@@ -2975,17 +2932,17 @@ msgid ""
 msgstr ""
 "自动重新加入一个断开了的聊天室前等待多少秒。设为 0 以禁用自动重新加入。"
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "用 Ctrl+Enter 发送消息, Enter 开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "为 Ctrl+KeyUP 存储多少行。"
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -2994,26 +2951,26 @@ msgstr ""
 "自定义地址, 在其中应包含 %s, %s 是单词/短语; 或'WIKTIONARY'以使用 "
 "wiktionary。"
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中, Gajim 可以被 gajim-remote 远程控制。"
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr "当不是每条消息都显示时间('有时'显示时间)时, 每多少分钟显示时间。"
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭聊天室标签/窗口前询问。"
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3022,7 +2979,7 @@ msgstr ""
 "如果关闭的是有可能会丢失数据的控件(不会被最小化的聊天、私人聊天、聊天室)，在"
 "关闭标签式聊天窗口前询问"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3031,38 +2988,38 @@ msgstr ""
 "逗号分割的列表。在有地址翻译/端口转发的情况下, 除了本地接口, 还将向其中的主机"
 "发送文件传输请求。"
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 1 KiB = 1024 bytes(字节), 1 KB = 1000 bytes。"
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "在通知区域中提示事件"
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "只有一个对话时显示标签?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天窗口中显示标签组的边框。"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭按钮?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "在弹出提示中预览消息?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
 msgstr "用分号隔开的在聊天室中将高亮显示的单词列表。"
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3072,22 +3029,13 @@ msgstr ""
 "如果为真, 单击窗口管理器的 X 按钮会退出 Gajim。这一设定仅当启用通知区域图标时"
 "会生效。"
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"如果为真, Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题, 该图标可"
-"能是动态的。"
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3096,13 +3044,13 @@ msgstr ""
 "如果为真, Gajim 将在联系人列表窗口中每一个联系人名字的下方显示状态信息（如果"
 "不为空）。"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "定义了在联系人列表中头像的显示位置。可以是左或右"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3111,26 +3059,26 @@ msgstr ""
 "如果为否, Gajim 将不会在联系人的状态或状态信息变化时在聊天窗口中显示一行提"
 "示。"
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "无法加入聊天室"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "无法加入聊天室"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "不要将联系人列表窗口显示在系统的任务栏中。"
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3139,7 +3087,7 @@ msgstr ""
 "如果为真并且安装的 GTK+ 和 PyGTK 的版本至少为 2.8, 当有未处理事件时使窗口闪烁"
 "(大部分窗口管理器的默认响应)"
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3159,7 +3107,7 @@ msgstr ""
 "'peracct' - 每个账户的消息发送到一个单独的窗口。\n"
 "'pertype' - 每种类型的消息 (例如, 聊天 及 聊天室) 发送到一个单独的窗口。"
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 msgid ""
 "Show contact list window on startup.\n"
 "'always' - Always show contact list window.\n"
@@ -3167,32 +3115,32 @@ msgid ""
 "'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "如果为假, 您将不会在窗口中看到头像。"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "如果为真, 按 Escape 键将关闭标签/窗口。"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "在聊天室窗口中隐藏标语"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "在聊天室窗口中隐藏标语"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "在聊天室聊天窗口中隐藏成员列表。"
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3200,32 +3148,32 @@ msgid ""
 msgstr ""
 "在聊天中, 只在当前一条消息不是由同一个人发出的的时候才在一行前显示昵称。"
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "当合并连续昵称时缩进。"
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "当所有标签中没有未读消息时按 Ctrl-Tab 转到下一个正在编辑的标签。"
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr "是否显示确认屏蔽联系人对话框?空字符串意味着从不显示对话框。"
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr "是否显示确认屏蔽联系人对话框?空字符串意味着从不显示对话框。"
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3235,14 +3183,14 @@ msgstr ""
 "如果为真, 您将可以在修改账户窗口中为您的账户可以设置一个负的优先级。注意!当您"
 "使用负的优先级登入时您将不能从服务器收到任何消息。"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr "如果为是, Gajim 会在账户和群组显示在线人数和总联系人数。"
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3250,21 +3198,17 @@ msgid ""
 msgstr ""
 "如果为真, 在聊天窗口没有打开时, Gajim 会滚动并选出最后给您发送消息的联系人。"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "时间, 如果在此时间内没有活动, 将改变状态窗口关闭。"
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "在对话中最多显示的行数。最旧的那些行会被清除。"
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "2次检查闲置之间的时间间隔。"
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3273,27 +3217,27 @@ msgstr ""
 "合法的 URI Scheme。只有这个列表中的 Scheme 会被接受为\"真正的\" URI。(mailto "
 "和 xmpp 被分开处理)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr "如果为是, 聊天室中会像命令符一样自动补全"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr "可选地修正 jingle 视频输出的帧速率。比如: 10/1 或 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "可选地缩放 jingle 视频输出尺寸。比如: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3302,145 +3246,145 @@ msgstr ""
 "如果为真, Gajim 在使用 jingle 时会尝试使用 STUN 服务器。服务器可以由"
 "\"stun_server\"选项给出, 或由 jabber 服务器给出。"
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "在使用 jingle 时使用的 STUN 服务器"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr "如果为是, Gajim 会在聊天室的成员的状态图标上加上一个彩色方框以显示阶级"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr "如果选中, Gajim 在您发送的消息被您的联系人接收后不会显示图标"
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr "如果为真, Gajim 会使用 Gnome Keyring (如果可用) 存储账户的密码。"
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "将本聊天室加入书签(_B)"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3450,59 +3394,59 @@ msgstr ""
 "自动连接时使用的状态。可以是\"在线\", \"聊天\", \"离开\", \"离开很久了\", "
 "\"请勿打扰\", \"隐身\"。注意: 仅当 restore_last_status 被禁用时这个选项其作用"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "如果启用, 则恢复上次使用的状态。"
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr "如果为真, 联系人的认证请求将被自动接受。"
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "如果为假, 这个账户将被禁用且不会出现在联系人列表窗口中。"
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "尚未连接到服务器"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr "在使用明文连接发送密码前显示一个警告对话框。"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr "在重新连接前等待 ping alive packet 的回应多少秒"
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3511,33 +3455,33 @@ msgstr ""
 "如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
 "件传输。"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr "如果选中, Gajim 在您发送的消息被您的联系人接收后不会显示图标"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "允许Gajim发送您的本地时间。"
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "向您希望添加的联系人发送的消息"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3546,76 +3490,72 @@ msgstr ""
 "如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
 "件传输。"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "%s 的SSL证书验证"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "为这个账户启用 ESession 加密。"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "无法加入聊天室"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "无法加入聊天室"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3625,84 +3565,84 @@ msgstr ""
 "表述在退出时是否激活插件(在 Gajim 退出时这会被保存)。这个选项不应该用于激活或"
 "禁用插件。使用图形界面代替。"
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "马上回来"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "几分钟就回来。"
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "吃东西"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "我正在工作。"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "电影"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "我正在看电影。"
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "工作"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "打电话"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "我正在打电话"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "外出"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "我现在处于禁止状态。"
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "请勿打扰。"
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "再见!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3710,1061 +3650,1061 @@ msgid ""
 msgstr ""
 "当收到的聊天室的消息包含muc_highlight_words内的词或您的昵称时播放的声音。"
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "收到任意MUC消息时播放的声音。"
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "To"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误: 无法按读打开文件 %s"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "无"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "聊天室支持"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "聊天室突出显示："
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "聊天室邀请"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "聊天室邀请"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "多人聊天(_G)"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "聊天室支持"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "无"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "聊天室创建是受限的。"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "新聊天室"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "找不到该服务"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "%s 不是一个聊天室服务器"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "帐户本地已存在。"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "聊天室 <b>%s</b> 不存在。"
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "多人聊天历史"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "做家务"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "买杂货"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "清洁"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "做饭"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "做保养"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "洗碗"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "洗衣服"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "园艺"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "奔波"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "遛狗"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "喝酒"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "喝啤酒"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "喝咖啡"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "喝茶"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "吃点心"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "吃早餐"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "吃晚餐"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "吃午餐"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "锻炼"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "骑车"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "跳舞"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "步行"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "慢跑"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "运动"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "跑步"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "滑雪"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "游泳"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "锻炼"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "打扮"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "泡温泉"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "刷牙"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "剪头发"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "刮胡子"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "洗澡"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "洗澡"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "赴约"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "未活动的"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "休息日"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "溜达"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "藏起来"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "渡假"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "祈祷"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "规划假期"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "思考"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "放松"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "钓鱼"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "游戏"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "外出"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "聚会"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "读书"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "排练"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "购物"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "抽烟"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "社交"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "日光浴"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "看电视"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "看电影"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "谈话"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "在现实世界中"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "打电话"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "视频电话"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "旅行"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "上下班"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "开车"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "坐车"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "坐公交车"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "坐飞机"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "坐火车"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "旅途"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "走路"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "编写代码"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "开会"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "学习"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "写作"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "害怕"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "大为惊奇"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "含情脉脉"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "生气"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "恼怒"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "焦虑"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "激情澎湃"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "羞愧"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "厌倦"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "勇敢"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "冷静"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "谨慎"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "冰冷"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "自信"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "困惑"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "沉思, 冥想"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "争辩"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "古怪"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "疯狂"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "创造"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "好奇"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "沮丧"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "消沉"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "失望"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "厌恶"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "诧异"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "心烦意乱"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "尴尬"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "羡慕"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "兴奋"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "卖弄风情"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "懊丧"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "感激"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "悲伤"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "暴躁"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "内疚"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "快乐"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "满怀希望"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "活跃"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "谦逊"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "丢脸"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "饿"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "受伤"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "印象深刻"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "敬畏"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "恋爱"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "愤慨"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "感兴趣"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "麻醉"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "无敌的"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "吃醋"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "寂寞"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "迷惘"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "幸运"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "小气"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "喜怒无常"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "紧张"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "中立"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "生气"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "义愤填膺"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "有趣"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "骄傲"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "放松"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "宽慰"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "后悔"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "坐立不安"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "伤心"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "讽刺"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "满意"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "严肃"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "震惊"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "害羞"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "不舒服"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "瞌睡"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "心血来潮"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "压力很大"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "强壮"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "惊讶"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "感激"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "渴"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "累"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "未定义"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "虚弱"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "担忧"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "默认"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "海洋"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "藏起来"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "账号"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "账户"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "描述"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "错误"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "一"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "聊天室"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 #, fuzzy
 msgid "street"
 msgstr "stream"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "无法获得发行者的证书"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "无法获得证书吊销列表"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "无法解密证书签名"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "无法解密证书吊销列表的签名"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "无法解码发行者的公钥"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "证书签名失败"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "吊销证书列表签名失败"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "证书还未生效"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "证书已过期"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "证书吊销列表还未生效"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "证书吊销列表已过期"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "格式错误, 在证书的'不早于'字段"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "格式错误, 在证书的'不迟于'字段"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式错误, 在证书吊销列表的'最后更新'字段"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式错误, 在证书吊销列表的'下次更新'字段"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "内存耗尽"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "自签名的证书"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "自签名的证书, 在证书链中"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "无法获得本地发行者证书"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "无法验证第一个证书"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "证书链太长"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "证书已被吊销"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "无效的 CA 证书"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "超过了路径长度限制"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "不支持的证书用途"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "不被信任的证书"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "证书被拒绝"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Subject 与 发行者 不匹配"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 与 subject key identifier 不匹配"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 与 发行者序列号 不匹配"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "密钥用途中不包含证书签名"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "应用程序验证失败"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "证书已被吊销"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "未知的 SSL 错误: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "证书已过期"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "授权被接受"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "账户被禁用"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "证书已过期"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "认证请求"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "不支持扩展"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "\"%s\"登录验证失败"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4826,12 +4766,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s 设置错误"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4850,293 +4790,249 @@ msgstr ""
 "错误: \n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "音频输入"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "音频输出"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "视频输入"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "服务器名必须在 1 到 1023 个字符之间"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "主机名中有无效的字符。"
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "服务器的地址是必须的。"
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "用户名必须在 1 到 1023 个字符之间"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "在用户名中有无效的字符。"
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "资源必须在 1 到 1023 个字符之间"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "资源中含有无效字符。"
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "忙碌"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "禁止(_N)"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "禁止"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "在线(_A)"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "在线"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "正在连接"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "离开"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "离线"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "未知"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "有错误"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "无"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "未知"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "无"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "认证"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "无"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "参与者"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "参与者"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "访客"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "访客"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?聊天室联系人阶级:None"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "所有者"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "所有者"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "管理员"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "管理员"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "成员"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "成员"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "注意着与您的对话"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "正在输入消息..."
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "暂停输入消息"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 条消息未处理"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "在聊天室中(_G)"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, python-format
 msgid "from user %s"
 msgstr "来自用户 %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "from %s"
 msgstr "来自 %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 个未处理事件"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "我想添加您到我的联系人列表"
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "您好, 我是$name"
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "读取文件超时"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "图片太大"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "证书吊销列表还未生效"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "读取文件超时"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 是一个文件但它应该是一个目录"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
@@ -5236,83 +5132,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "我想将您添加到我的联系人列表。"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "文件为空"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "文件不存在"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E 加密被禁用"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "改变状态信息"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "改变状态"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "设置状态类型与描述"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "和我聊天吧"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "在线"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "离开很久了"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "请无打扰"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "离线 - 未连接"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "状态描述: "
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "状态发生了变化。"
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "已发送联系人: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "已发送联系人: "
 
@@ -5335,7 +5231,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "账号"
 
@@ -5346,7 +5242,7 @@ msgstr "聊天室"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "密码: "
@@ -5370,7 +5266,7 @@ msgstr "在聊天室中(_G)"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "加入(_J)"
@@ -5388,17 +5284,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -5544,7 +5440,7 @@ msgstr "联系人信息"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "描述"
 
@@ -5742,40 +5638,45 @@ msgstr "工作"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "关于"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "加入聊天室"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "马上回来"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "移除账户 %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "清洁"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5845,6 +5746,7 @@ msgid "Strike"
 msgstr "划去"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Color"
 
@@ -5857,136 +5759,133 @@ msgstr "字体"
 msgid "Clear formatting"
 msgstr "清楚格式"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "选择客户端证书"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "显示表情列表(Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "封禁..."
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "更改昵称(_N)"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "更改主题(_S)"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "输入新密码"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "离开聊天室"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "如果选定, Gajim 会在启动时加入此聊天室"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>发生了一个错误: </b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "重新验证"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "参与者"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "您也可以输入一个可选的替代地点: "
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "参与者"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "新聊天室"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "正在销毁 %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "您也可以输入一个可选的替代地点: "
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "原因"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "为群组 %s 输入新的名称"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "邀请(_V)"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "事件类型"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "事件"
-
 #: gajim/data/gui/chat_control.ui:35
 msgid "<b>1</b>"
 msgstr "<b>1</b>"
@@ -6074,20 +5973,20 @@ msgid "Add"
 msgstr "添加"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "移除(_R)"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "资源: "
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "状态"
 
@@ -6096,7 +5995,7 @@ msgid "Client"
 msgstr "客户端"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 msgid "System"
 msgstr "系统"
 
@@ -6236,50 +6135,51 @@ msgstr "窗口行为(_W)"
 msgid "_Show contact list on startup"
 msgstr "Gajim 启动时连接(_O)"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "合并帐户(_G)"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "在联系人列表显示中联系人的头像(_V)"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
 "in group chats"
 msgstr "如果选定, Gajim 会在联系人列表和聊天室窗口中显示所有联系人的头像"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "在联系人列表中显示联系人的状态信息(_M)"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6287,53 +6187,53 @@ msgid ""
 msgstr ""
 "如果选定, Gajim 会在联系人列表和聊天室窗口中联系人名称下方显示联系人状态信息"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "在联系人列表中显示联系人的位置信息(_L)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "将联系人按状态排序"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "已发送联系人: "
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "在聊天室中(_G)"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "联系人列表项交换"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "拼写检查工具"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
 "highlighted. If no language is explicitly set via right click on the input "
@@ -6343,212 +6243,213 @@ msgstr ""
 "如果选定, Gajim 会在聊天窗口中将编辑框中的拼写错误高亮显示。如果没有通过在编"
 "辑框点击右键的方式显式设定语言, 联系人或聊天室的默认语言将被使用。"
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "消息内容"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "显示格式列表(Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "在联系人列表中显示联系人的状态信息(_M)"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
 "changes their status or status message"
 msgstr ""
 "如果选中, 在1对1聊天时，当有一方更改状态时，在聊天窗口的状态栏显示状态信息"
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "无法加入聊天室"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "无法加入聊天室"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "插件"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "记录联系人状态变化(_L)"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "在标签上显示关闭按钮?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "在标签上显示关闭按钮?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "最后状态"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "聊天"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "在通知区域显示图标: "
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "当收到新的事件: "
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "提醒我联系人登录(_I)"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "提醒我联系人登出(_O)"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 msgid "Visual Notifications"
 msgstr "可视化提示"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "管理...(_N)"
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "在我忙碌时允许播放声音(_B)"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav声音"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "通知"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "禁止"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr "如果选定, Gajim 会在计算机空闲更长时间后将您的状态设置为禁止。"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr "如果选定, Gajim 会在计算机空闲更长时间后将您的状态设置为禁止。"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6560,7 +6461,7 @@ msgstr ""
 "$S会被上个状态信息替换\n"
 "$T会被自动离开的超时时间替换"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6572,104 +6473,104 @@ msgstr ""
 "$S会被上个状态信息替换\n"
 "$T会被自动禁止的超时时间替换"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "分钟"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "自动调整状态"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "询问状态信息, 当我: "
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "退出登录(_O)"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr "如果选中, Gajim 不会询问状态信息, 而使用特定的默认信息。"
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "默认消息"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "启用"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "状态信息"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 msgid "Preset Status Messages"
 msgstr "预设状态信息"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "主题"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "主题"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "配置界面颜色与字体"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 msgid "_Dark Theme"
 msgstr "暗黑主题(_D)"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 msgid "_Emoji Theme"
 msgstr "Emoji 主题(_E)"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "状态图标集(_I): "
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "使用代理的图标设定(_T)"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
 "ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)"
@@ -6677,74 +6578,74 @@ msgstr ""
 "如果选中, Gajim 会以协议特定的方式显示状态图标。(例如, MSN 联系人会以同MSN 相"
 "同的图标显示在线, 离开, 忙, 等等状态...)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "风格"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "特性"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "音频输出设备"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "音频输入设备"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "音频测试"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "视频测试"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "视频输入设备"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "视频输出"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "视频帧速率"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "视频尺寸"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "连接"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "STUN 服务器: "
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
@@ -6752,50 +6653,60 @@ msgstr ""
 "STUN 服务器的主机名。如果没有给出, Gajim 会\n"
 "尝试从服务器上发现一个。"
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "音频/视频"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "管理..."
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "记录联系人状态变化(_L)"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "如果选定, Gajim 会记录本账户的密码"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "打开...(_O)"
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "高级设置编辑器"
@@ -6977,12 +6888,12 @@ msgstr ""
 msgid "Your password"
 msgstr "输入新密码"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "高级动作"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "使用自定义的主机名/端口"
@@ -7068,7 +6979,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "登录(I)"
@@ -7082,7 +6993,7 @@ msgstr "请选择一个昵称"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7109,8 +7020,8 @@ msgstr "恢复为默认颜色设置(_R)"
 msgid "Resets value to default"
 msgstr "恢复为默认颜色设置(_R)"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "主机名(_H): "
@@ -7152,7 +7063,7 @@ msgstr "查看证书…"
 msgid "Proxy Host"
 msgstr "代理服务器地址(_H): "
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "类型"
 
@@ -7166,8 +7077,7 @@ msgstr "协议(_P): "
 msgid "Copy info to clipboard"
 msgstr "复制链接位置(_C)"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "特性"
 
@@ -7349,6 +7259,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "更改状态信息…"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>心情: </b>"
@@ -7425,9 +7340,10 @@ msgid "Installed"
 msgstr "已安装"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr "插件的描述会被显示在这里。这些文字在插件窗口初始化时将被去除"
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7613,79 +7529,106 @@ msgstr "插件"
 msgid "_Name"
 msgstr "名称(_N): "
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "代理服务器(_Y): "
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "开始聊天"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "离开聊天室"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "历史记录管理器"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "插件"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "参数"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "账户"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "视图(_V)"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "只显示活动的联系人(_A)"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "显示离线联系人"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "只显示活动的联系人(_A)"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "显示代理(_P)"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr "XML 控制台"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "文件传输"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "帮助(_H)"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "在线"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "在线"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "特性"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "关于"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7700,6 +7643,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "离开聊天室"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -7983,58 +7931,66 @@ msgstr "联系人列表项交换"
 msgid "Create new group chat"
 msgstr "离开聊天室"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "参数"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "插件"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "文件传输"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 msgid "Set the status message"
 msgstr "设置状态信息"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "显示 XML 控制台(_X)"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 msgid "Appearance"
 msgstr "聊天窗口外观"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "显示离线联系人"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "只显示活动的联系人(_A)"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "只显示活动的联系人(_A)"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "联系人"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "联系人信息"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "重命名联系人"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "已发送联系人: "
@@ -8110,12 +8066,16 @@ msgstr "请填写表格。"
 msgid "Group Chat Configuration"
 msgstr "聊天室邀请"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML 控制台"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "开始聊天(_S)"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "过滤器: "
@@ -8161,11 +8121,6 @@ msgstr "显示所有未处理事件(_E)"
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "参数"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8490,124 +8445,124 @@ msgstr "已收到 %(max)s 中的 %(received)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "无"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s 加入聊天室"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "聊天室突出显示："
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "聊天室支持"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "聊天室突出显示："
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "无"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "聊天室支持"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "聊天室突出显示："
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "无"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "该操作无法撤销。"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "聊天室支持"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "聊天室支持"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "聊天室支持"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "无"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "聊天室邀请"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "本次会话将在服务器上被存档"
@@ -8636,7 +8591,7 @@ msgid "Sender: %s"
 msgstr "发送者: %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "接收者："
 
@@ -8787,7 +8742,7 @@ msgstr "文件: "
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "发送者: "
 
@@ -8801,7 +8756,7 @@ msgid "Change"
 msgstr "更改昵称(_N)"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "马上回来"
@@ -8832,11 +8787,12 @@ msgid "Password Change Failed"
 msgstr "需要密码"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "创建帐户过程中发生错误"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -8873,40 +8829,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "未知的 SSL 错误: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "开始新对话"
+msgid "Start / Join Chat"
+msgstr "开始聊天"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必须连接才能加入聊天室。"
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "加入聊天室"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "添加联系人(_A)..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr "%s 未找到"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "服务还没有详细的信息应答"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8915,174 +8866,174 @@ msgstr ""
 "这个服务无法应答详细的信息。\n"
 "这很可能是服务器的遗留问题, 或者服务器被损坏了"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "其他"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "聊天室"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用账户 %s 来发掘服务"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr "此地址没有服务或无应答。请检查地址后重试。"
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用账户 %(account)s 浏览地址 %(address)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "浏览(_B)"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "命令"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "查找(_S)"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "已扫描 %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "用户"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "订阅"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "节点"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "新发表"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "订阅(_S)"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "发送单条消息(_S)"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "主题"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "单条消息, 使用账户 %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "单条消息, 在账户 %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "单条消息"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "不允许的字符"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认您已经连接到 \"%s\"。"
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "不能向 %s 发送消息, 无效的 JID。"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "回复: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道: \n"
@@ -9128,94 +9079,76 @@ msgstr "注册成功"
 msgid "Registration failed"
 msgstr "注册失败"
 
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "语言“%s”的词典不可用"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"您必须安装“%s”词典才能使用拼写检查，或者您可以在 speller_language 选项中选择"
-"另一种语言。\n"
-"\n"
-"高亮拼写错误功能将不会被启用"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "客户端证书"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "帐户 %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG 号码: "
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "expire"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "聊天室邀请"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact 邀请您参加聊天室 %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "注释: %s"
@@ -9230,6 +9163,11 @@ msgstr "GG 号码: "
 msgid "ICQ Number"
 msgstr "ICQ 号码: "
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "添加联系人(_A)..."
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9282,9 +9220,9 @@ msgid "Error while adding transport contact"
 msgstr "添加传输联系人出错"
 
 #: gajim/gtk/add_contact.py:486
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9447,42 +9385,62 @@ msgstr "联系人已断开连接"
 msgid "Contact Connected Background "
 msgstr "已连接的联系人"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "状态信息"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "状态信息"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "状态信息"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "状态信息"
+
+#: gajim/gtk/themes.py:187
 msgid "Gajim Themes"
 msgstr "Gajim 主题"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "不合法的昵称"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "不允许的字符"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "您确定要删除所选定的消息？"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "这个名称已被使用。您想要覆盖这个状态信息吗?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "活动"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "插件"
@@ -9506,10 +9464,9 @@ msgid "Error: %s"
 msgstr "错误: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "错误"
 
@@ -9523,45 +9480,45 @@ msgstr "现在状态: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "现在状态: %(status)s"
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "新电子邮件"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "所有文件"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 msgid "Clear File"
 msgstr "清除文件"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 msgid "Manage Proxies"
 msgstr "管理代理服务器设置"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "代理服务器(_Y): "
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 msgid "Adjust to Status"
 msgstr "依据状态调整"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "Off"
 msgstr "关闭"
 
@@ -9581,7 +9538,7 @@ msgstr "账户"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "注册新账户成功"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9613,43 +9570,48 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "账户 \"%s\" 已连接到服务器"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "同步"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "您想要同步多久的记录？"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr "一个月"
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr "三个月"
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr "一年"
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr "全部"
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 msgid "Connecting..."
 msgstr "正在连接…"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "已收到 %(max)s 中的 %(received)s"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "已下载 %s 条信息"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, fuzzy, python-format
 msgid ""
 "Finished synchronising chat history:\n"
@@ -9660,16 +9622,16 @@ msgstr ""
 "        {received} 条信息已下载。\n"
 "        "
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "一个 GTK+ 的 XMPP 客户端"
@@ -9722,126 +9684,126 @@ msgstr "感谢"
 msgid "translator-credits"
 msgstr "翻译者-贡献"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "选择要发送的文件..."
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "选择归档文件"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "所有文件"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "所有文件"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "发送文件(_F)"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "图像"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "选择归档文件"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Zip 文件"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "另存为..."
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此聊天室的 %(owner_or_admin_or_member)s"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "已连接"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "文件名: %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "下载"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "上传"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "文件传输已停止"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:暂停"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:暂停"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "描述: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:暂停"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:暂停"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暂停"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:暂停"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:暂停"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:暂停"
@@ -9850,7 +9812,7 @@ msgstr "?transfer status:暂停"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "无效文件"
@@ -9906,25 +9868,25 @@ msgstr "聊天室消息突出显示"
 msgid "Group Chat Message Received"
 msgstr "收到的聊天室消息"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "require"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Yes"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "取消(_C)"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -9942,11 +9904,6 @@ msgstr "使用账户 %s"
 msgid "Hide _Contact List"
 msgstr "邀请联系人(_C)"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "只显示活动的联系人(_A)"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
@@ -9990,35 +9947,30 @@ msgid ""
 "later."
 msgstr "发布您的个人信息时发生错误, 请稍后重试。"
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存档首选项"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "编辑存档首选项(_V)"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "您的存档首选项已成功保存！"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "尚未连接到服务器"
+msgid "Archiving Preferences Error"
+msgstr "编辑存档首选项(_V)"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 msgid "Error received: {}"
 msgstr "收到错误：{}"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "编辑存档首选项(_V)"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "激活的"
@@ -10067,181 +10019,181 @@ msgstr "无"
 msgid "?password:Hidden"
 msgstr "密码: "
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "编辑存档首选项(_V)"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "音频/视频"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "开始进行语音视频通话的能力。"
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "特性在 Windows 下不可用。"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr "测算空闲时间以自动调整状态的能力。"
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "需要 libxss 库。"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr "无需服务器自动侦测本地网络中其他客户端进行聊天"
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "需要: gir1.2-gupnpigd-1.0"
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "需要pybonjour和bonjour的SDK运行 (%(url)s)"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "连接"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "需要 Gspell。"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "特性在 Windows 下不可用。"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "通知"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "开始进行语音视频通话的能力。"
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "需要 python-dbus。"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "保存密码"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "密码可以被安全地存储, 而不只是以纯文本方式。"
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "需要 gnome-keyring 和 python-gnome2-desktop, 或 kwalletcli。"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "拼写检查工具"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "需要 Gspell。"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr ""
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "需要: gir1.2-gupnpigd-1.0"
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "编辑存档首选项(_V)"
@@ -10287,7 +10239,7 @@ msgstr "不合法的列表名"
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个隐私策略列表。"
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "邀请联系人(_C)"
@@ -10315,7 +10267,7 @@ msgstr "完成(_F)"
 msgid "Commands"
 msgstr "命令"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10388,119 +10340,133 @@ msgstr "%s 的认证请求"
 msgid "Loading"
 msgstr "编写代码"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "已连接"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "移除账户 %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "点击以改变该账户的密码"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "正在连接…"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "您的服务器不支持 Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "不允许的字符"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "您的服务器不支持 Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "账户 \"%s\" 已连接到服务器"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "添加联系人(_A)..."
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "创建新消息"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "自定义端口必须为端口号。"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "资源必须在 1 到 1023 个字符之间"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "高级动作"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "将封禁 %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "未知的 SSL 错误: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "移除账户 %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "注册到 %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "账户"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "账户已成功添加"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "账户"
@@ -10543,249 +10509,253 @@ msgstr "查找"
 msgid "No results found"
 msgstr "无结果"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "默认"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "状态信息标题"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "状态信息文本"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "现在重新登录?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "现在重新登录?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "如果想使所有调整立即生效, 您必须重新登录。"
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "无效的账户"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "账户 \"%s\" 已连接到服务器"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "所有的聊天和聊天室窗口将会关闭。您想继续吗?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "无效的账户"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 #, fuzzy
 msgid "Label"
 msgstr "标签"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "邀请联系人(_C)"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "客户端证书"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Gajim 启动时连接(_O)"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "保存与所有联系人的聊天记录(_L)"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "所有状态"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "改变一个或多个账户状态"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "使用文件传输代理服务器"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "空闲开始时间："
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "客户端证书"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "邀请联系人(_C)"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "忽略联系人列表以外的联系人触发的事件(_I)"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "优先级(_T):"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "使用 HTTP__PROXY 环境变量(_U)"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "改变一个或多个账户状态"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "名: "
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "姓: "
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "新电子邮件"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "依据状态调整(_A)"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 #, fuzzy
 msgid "Enable"
 msgstr "启用"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "端口(_P)"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "连接"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "客户端证书"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PKCS12 文件"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "客户端证书"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "客户端证书"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "保存密码"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "插件"
@@ -10834,19 +10804,19 @@ msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "删除了%d个联系人"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "未知艺术家"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "未知标题"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "未知来源"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10860,22 +10830,22 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "将本聊天室加入书签(_B)"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 #, fuzzy
 msgid "Archive empty"
 msgstr "文件为空"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "服务发送了畸形的数据"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
@@ -10933,125 +10903,241 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "显示所有未处理事件(_E)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "特性"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "对正在编辑的消息进行拼写检查。"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 msgid "Support for service discovery including nodes and search for users"
 msgstr "支持包括用户搜索和节点在内的服务发现功能"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "联系人"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 msgid "Group chat support"
 msgstr "聊天室支持"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "最近: "
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "注册失败"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "开始新对话"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "未知的 SSL 错误: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "2次检查闲置之间的时间间隔。"
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "语言“%s”的词典不可用"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "您必须安装“%s”词典才能使用拼写检查，或者您可以在 speller_language 选项中选"
+#~ "择另一种语言。\n"
+#~ "\n"
+#~ "高亮拼写错误功能将不会被启用"
+
+#~ msgid "_Reconnect"
+#~ msgstr "重新连接(_R)"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "只显示活动的联系人(_A)"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "添加联系人(_A)..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "邀请联系人(_C)"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "离开聊天室"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "新聊天室"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "如果为真, Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题, 该图标"
+#~ "可能是动态的。"
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "服务器名必须在 1 到 1023 个字符之间"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "主机名中有无效的字符。"
+
+#~ msgid "Server address required."
+#~ msgstr "服务器的地址是必须的。"
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "用户名必须在 1 到 1023 个字符之间"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "在用户名中有无效的字符。"
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "资源必须在 1 到 1023 个字符之间"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "资源中含有无效字符。"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "提醒我联系人登录(_I)"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "提醒我联系人登出(_O)"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "在弹出提示中预览消息?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "文件传输完成时提醒我(_N)"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "文件传输完成时提醒我(_N)"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "状态变更通知的背景色"
+
+#~ msgid "Event Type"
+#~ msgstr "事件类型"
+
+#~ msgid "Event desc"
+#~ msgstr "事件"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "尚未连接到服务器"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "资源冲突"
 
@@ -11681,9 +11767,6 @@ msgstr "注册失败"
 #~ msgid "_Send Private Message"
 #~ msgstr "发送私聊消息(_S)"
 
-#~ msgid "Send _File"
-#~ msgstr "发送文件(_F)"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "参与者"
@@ -14284,9 +14367,6 @@ msgstr "注册失败"
 #~ "如果用于接收消息的默认端口不合适, 您可以在这里选择另外一个。\n"
 #~ "您可能需要改变防火墙设置。"
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "合并帐户(_G)"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP 在这台计算机上不可用"
 
@@ -14824,9 +14904,6 @@ msgstr "注册失败"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "需要 python-gnome2。"
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "需要 gnome-keyring 和 python-gnome2-desktop, 或 kwalletcli。"
-
 #~ msgid "SRV"
 #~ msgstr "SRV"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7cac1d72c..e524cc011 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.15a1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
 "PO-Revision-Date: 2011-09-07 23:11+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -20,76 +20,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "帳號"
+
+#: gajim/chat_control_base.py:570
 msgid "and authenticated"
 msgstr "且已被認證"
 
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
 msgid "and NOT authenticated"
 msgstr "且未被認證"
 
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s 加密 %(status)s 活動 %(authenticated)s。\n"
 "您的聊天作業階段 %(logged)s 將被記錄。"
 
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
 #, fuzzy
 msgid "Paste Image"
 msgstr "選擇圖像"
 
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "您將要關閉多個標籤"
 
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "您確定要離開聊天室\"%s\"嗎?"
 
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
 #: gajim/message_window.py:364
 msgid "_Do not ask me again"
 msgstr "不要再問我了(_D)"
 
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
 #, fuzzy
 msgid "Privacy"
 msgstr "隱私策略清單"
 
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
 #, fuzzy
 msgid "Warning"
 msgstr "將封禁 %s"
 
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
 #, fuzzy, python-format
 msgid ""
 "If you send a file to <b>%s</b>, your real XMPP address will be revealed."
 msgstr "如果您想 %s 傳送檔案，他/她會獲知您的真實 Jabber ID。"
 
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
 msgid "_Continue"
 msgstr "繼續(_C)"
 
@@ -151,499 +157,494 @@ msgstr "沒有未處理的認證請求"
 msgid " resource with priority "
 msgstr "帶有優先等級的資源"
 
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
 #: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
 #: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
 msgid "Not in contact list"
 msgstr "顯示離線聯絡人"
 
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
 #, fuzzy
 msgid "I would like to add you to my contact list"
 msgstr "我想加入您到我的聯絡人清單"
 
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "傳送單條訊息(_M)"
 
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "執行命令(_E)…"
 
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
 msgid "_Manage Transport"
 msgstr "管理代理(_M)"
 
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
 #, fuzzy
 msgid "_Rename…"
 msgstr "重新命名(_R)"
 
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "解除阻斷(_U)"
 
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "阻斷(_B)"
 
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "移除(_R)"
 
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
 #, fuzzy
-msgid "Send File…"
+msgid "Send File"
 msgstr "傳送檔案(_F)"
 
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
 #, fuzzy
 msgid "Upload File…"
 msgstr "另存為…"
 
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "另存為…"
 
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "最後狀態"
 
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
 #, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
 msgstr "邀請聯絡人(_C)"
 
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
 #, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
 msgstr "加入聯絡人(_A)…"
 
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
 #, fuzzy
 msgid "Voice Chat"
 msgstr "語音聊天請求"
 
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
 #, fuzzy
 msgid "Video Chat"
 msgstr "視訊測試"
 
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
 #, fuzzy
 msgid "Information"
 msgstr "資訊(_I)"
 
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
 #, fuzzy
 msgid "History"
 msgstr "命令歷程(_H)"
 
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
 msgid "Disabled"
 msgstr "停用"
 
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
 msgstr "僅正在編輯"
 
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "所有聊天狀態"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
 #, fuzzy
-msgid "Invite Contact"
-msgstr "邀請聯絡人(_C)"
+msgid "All Chat States"
+msgstr "所有聊天狀態"
 
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
 #, fuzzy
 msgid "Manage Group Chat"
 msgstr "離開聊天室"
 
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
 #, fuzzy
-msgid "Rename Group Chat"
-msgstr "離開聊天室"
+msgid "Rename…"
+msgstr "重新命名(_R)"
 
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
 #, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
 msgstr "變更主題(_S)…"
 
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "離開聊天室"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "選擇歸檔檔案"
 
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
 #, fuzzy
-msgid "Destroy Group Chat"
-msgstr "新聊天室"
+msgid "Configure…"
+msgstr "配置"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "正在銷毀 %s"
 
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
 #, fuzzy
 msgid "Chat Settings"
 msgstr "外掛程式"
 
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
 msgstr "記錄聯絡人狀態變化(_L)"
 
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
 #, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
 msgstr "預設的訊息:"
 
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
 msgstr "關閉時最小化視窗"
 
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
 msgstr "自動聯結時縮到最小(_Z)"
 
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
 msgstr "變更暱稱(_N)…"
 
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
 #, fuzzy
 msgid "Request Voice"
 msgstr "要求語音(_R)"
 
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
 #, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
 msgstr "執行命令(_E)…"
 
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
 msgid "Leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "僅正在編輯"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "所有聊天狀態"
+
+#: gajim/gui_menu_builder.py:671
 #, fuzzy
 msgid "Add Contact…"
 msgstr "加入聯絡人(_A)…"
 
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
 #, fuzzy
 msgid "Profile"
 msgstr "檔案"
 
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "傳送單條訊息(_M)"
 
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
 msgstr "探索服務(_D)"
 
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
 #, fuzzy
 msgid "Server Info"
 msgstr "伺服器"
 
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
 msgid "Advanced"
 msgstr "進階"
 
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "編輯存檔偏好設定(_V)"
 
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
 #, fuzzy
 msgid "Blocking List"
 msgstr "封禁名單"
 
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Bookmarks"
 msgstr "將本聊天室加入書籤(_B)"
 
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
 #, fuzzy
 msgid "PEP Configuration"
 msgstr "組態"
 
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
 #, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
 msgstr "同步"
 
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
 msgid "Privacy Lists"
 msgstr "隱私策略清單"
 
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
 #, fuzzy
 msgid "Admin"
 msgstr "管理(_A)"
 
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "傳送伺服器訊息(_S)…"
 
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "設定 MOTD…"
 
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "更新 MOTD…"
 
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "刪除 MOTD"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
 #, fuzzy
 msgid "_Add Account…"
 msgstr "加入聯絡人(_A)…"
 
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "_Modify Accounts…"
 msgstr "修改帳號資訊(_M)"
 
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 #, fuzzy
 msgid "_Modify Account…"
 msgstr "修改帳號資訊(_M)"
 
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
 msgid "Accounts"
 msgstr "帳號"
 
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
 #, fuzzy
 msgid "Copy XMPP Address"
 msgstr "複製 JID/電子郵件位址(_C)"
 
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "加入多人聊天"
 
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
 #: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
 msgid "Start Chat"
 msgstr "開始聊天"
 
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "加入聯絡人(_A)…"
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "複製連結位置(_C)"
 
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "在瀏覽器中開啟連結(_O)"
 
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "複製 JID/電子郵件位址(_C)"
 
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "開啟郵件編輯器(_O)"
 
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
 #, fuzzy
 msgid "Copy Location"
 msgstr "複製連結位置(_C)"
 
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
 #, fuzzy
 msgid "Show Location"
 msgstr "位置: %s"
 
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
 #, fuzzy
 msgid "Copy XMPP Address/Email"
 msgstr "複製 JID/電子郵件位址(_C)"
 
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
 #, fuzzy
 msgid "Invite"
 msgstr "邀請(_V)"
 
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
 #, fuzzy
 msgid "Unblock"
 msgstr "解除阻斷(_U)"
 
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
 #, fuzzy
 msgid "Block"
 msgstr "阻斷(_B)"
 
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
 #, fuzzy
 msgid "Kick"
 msgstr "踢除(_K)"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
 #, fuzzy
 msgid "Ban"
 msgstr "封禁(_B)"
 
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
 #, fuzzy
 msgid "Make Owner"
 msgstr "所有者"
 
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
 #, fuzzy
 msgid "Make Admin"
 msgstr "管理(_A)"
 
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
 #, fuzzy
 msgid "Make Member"
 msgstr "成員"
 
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
 #, fuzzy
 msgid "Revoke Member"
 msgstr "成員"
 
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
 msgid "Grant Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
 #, fuzzy
 msgid "Revoke Voice"
 msgstr "要求語音(_R)"
 
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
 #, fuzzy
 msgid "Copy"
 msgstr "聊天室 JID"
 
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
 #, fuzzy
 msgid "Usage:"
 msgstr "message"
 
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
 #, fuzzy
 msgid "Options:"
 msgstr "表情(_E):"
 
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
 msgid "Cannot find history logs database"
 msgstr "無法找到命令歷程記錄資料庫"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "檔案不存在"
 
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
 #: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
 #: gajim/data/gui/vcard_information_window.ui:55
 #: gajim/data/gui/privacy_list_window.ui:317
 #: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
 #, fuzzy
 msgid "XMPP Address"
 msgstr "AIM 位址:"
 
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "日期"
 
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:442
@@ -651,28 +652,28 @@ msgstr "日期"
 msgid "Nickname"
 msgstr "暱稱"
 
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
 #: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "訊息"
 
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:205
 msgid "Subject"
 msgstr "主題"
 
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
 msgid "Database Cleanup"
 msgstr "資料庫清理"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
 #, fuzzy
 msgid "Clean up the database?"
 msgstr "建立快取資料庫"
 
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
 #, fuzzy
 msgid ""
 "This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -684,280 +685,285 @@ msgstr ""
 "\n"
 "如果您點擊\"是\"，請等待…"
 
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
 #, fuzzy
 msgid "_Cleanup"
 msgstr "清除(_U)"
 
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
 #: gajim/gtk/filetransfer.py:248
 msgid "You"
 msgstr "您"
 
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 時說:  %(message)s\n"
 
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
 #: gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "刪除"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "刪除確認"
 
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
 #, fuzzy, python-format
 msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "您確定要刪除所選取的訊息?"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "預設訊息"
 
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
 #, fuzzy
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "您確定要刪除所選取的訊息?"
 
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "聯絡人名稱: <i>%s</i>"
 
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
 #, python-format
 msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
 msgid "General"
 msgstr "一般"
 
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
 msgid "Group"
 msgstr "群組"
 
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
 msgid "In the group"
 msgstr "群組內"
 
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
 msgid "Set Mood"
 msgstr "設定 Mood"
 
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
 msgstr "無"
 
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 狀態訊息"
 
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
 msgid "Status Message"
 msgstr "狀態訊息"
 
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
 #, fuzzy
 msgid "Overwrite"
 msgstr "覆寫？"
 
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
 msgid "Overwrite Status Message?"
 msgstr "覆寫狀態訊息?"
 
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
 #, fuzzy
 msgid "This name is already in use. Do you want to overwrite this preset?"
 msgstr "這個名稱已被使用。您想要覆寫這個狀態訊息嗎?"
 
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "覆寫？"
 
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
 #, fuzzy
 msgid "Status Preset"
 msgstr "狀態訊息"
 
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
 #, fuzzy
 msgid "Save status as preset"
 msgstr "另存為…"
 
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
 #, fuzzy
 msgid "Please assign a name to this status message preset"
 msgstr "請為這個狀態訊息輸入一個名稱"
 
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
 #, fuzzy
 msgid "_Save"
 msgstr "儲存在: %s"
 
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
 #, fuzzy
 msgid "New Status"
 msgstr "狀態"
 
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
 msgid "You are not connected to the server"
 msgstr "尚未連線到伺服器"
 
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未連線時，您不能同步您的聯絡人。"
 
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
 #: gajim/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "名稱"
 
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
 #: gajim/data/gui/server_info.ui:146
 msgid "Server"
 msgstr "伺服器"
 
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
 msgid "This account is not connected to the server"
 msgstr "這個帳號已經連線到伺服器"
 
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "這個帳號連線後您才可以與之同步"
 
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
 msgid "Synchronise"
 msgstr "同步"
 
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
 msgid "an audio and video"
 msgstr "一個音訊和視訊"
 
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
 msgid "an audio"
 msgstr "一個音訊"
 
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
 msgid "a video"
 msgstr "一個視訊"
 
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s 想要與您發起一個 %(type)s 作業階段。您要回應嗎?"
 
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "傳送檔案(_F)"
+
+#: gajim/groupchat_control.py:411
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "另存為…"
 
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "檔案傳輸完成"
 
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
 #, fuzzy
 msgid "Invalid XMPP Address"
 msgstr "無效檔案"
 
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
 msgid "Could not load image"
 msgstr "無法讀取圖片"
 
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
 #, fuzzy, python-format
 msgid "Kick %s"
 msgstr "將踢走 %s"
 
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
 #, fuzzy, python-format
 msgid "Ban %s"
 msgstr "封禁名單"
 
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
 msgid "Insert Nickname"
 msgstr "插入暱稱"
 
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
 #, fuzzy
 msgid "Voice Request"
 msgstr "語音聊天請求"
 
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
 #, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
 msgstr ""
 
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
 #, fuzzy
 msgid "_Approve"
 msgstr "approve"
 
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s 將主題設定為 %(subject)s"
 
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
 #, fuzzy
 msgid "Group chat now shows unavailable members"
 msgstr "聊天室現在顯示了無法使用的成員"
 
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
 #, fuzzy
 msgid "Group chat now does not show unavailable members"
 msgstr "聊天室現在不顯示無法使用的成員"
 
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
 #, fuzzy
 msgid "Conversations are stored on the server"
 msgstr "本次作業階段將在伺服器上被存檔"
 
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
 #, fuzzy
 msgid "Conversations are not stored on the server"
 msgstr "伺服器中儲存的關於您的資訊"
 
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
 #, fuzzy
 msgid "Group chat is now non-anonymous"
 msgstr "聊天室現在是非匿名的"
 
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Group chat is now semi-anonymous"
 msgstr "聊天室現在是半匿名的"
 
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
 #, fuzzy
 msgid "Group chat is now fully anonymous"
 msgstr "聊天室現在是完全匿名的"
@@ -972,7 +978,7 @@ msgstr "Pong! (%s s.)"
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
 msgid "Error."
 msgstr "錯誤。"
 
@@ -1001,22 +1007,22 @@ msgstr "一個新的聊天室被建立"
 msgid "Failed to Configure Group Chat"
 msgstr "離開聊天室"
 
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
 #, python-format
 msgid "You are now known as %s"
 msgstr "您現在成了 %s "
 
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s 現在成了 %(new_nick)s"
 
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "您現在成了 %s "
 
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s 的狀態是 %(status)s"
@@ -1142,81 +1148,81 @@ msgstr "您確定要離開聊天室\"%s\"嗎?"
 msgid "If you close this window, you will leave '%s'."
 msgstr "如果關閉此視窗，您將中斷此聊天室的連線。"
 
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
 msgid "Show a list of formattings"
 msgstr "顯示格式清單(Alt+M)"
 
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "這個聯絡人不支援檔案傳輸"
 
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 狀態: %(state)s，原因: %(reason)s"
 
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "聊天室 %(room_name)s 的 %(nickname)s"
 
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
 #, fuzzy
 msgid "Note: Chat history is disabled for this contact."
 msgstr "忽略這個證書的這個錯誤。"
 
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
 msgid "Note: Chat history is disabled for this account."
 msgstr ""
 
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
 #, fuzzy, python-format
 msgid ""
 "You just received a new message from %s.\n"
 "Do you want to close this tab?"
 msgstr "您剛剛收到一條來自 \"%s\" 的訊息"
 
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
 #: gajim/gtk/remove_account.py:44
 #, fuzzy
 msgid "Close"
 msgstr "傳送並關閉(_S)"
 
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
 msgid "New Message"
 msgstr "新訊息"
 
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
 #, fuzzy
 msgid "_Close"
 msgstr "傳送並關閉(_S)"
 
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1225,187 +1231,178 @@ msgstr ""
 "主題: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s 的狀態是 %(status)s"
 
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
 #, fuzzy
 msgid "Size"
 msgstr "大小:  %s"
 
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
 #: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
 #, fuzzy
 msgid "_Accept"
 msgstr "帳號(_A)"
 
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "離線(_O)"
 
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
 msgid "File Transfer Completed"
 msgstr "檔案傳輸完成"
 
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
 #, fuzzy
 msgid "Open _Folder"
 msgstr "開啟資料夾(_O)"
 
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
 #: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
 #, fuzzy
 msgid "Group Chat Invitation"
 msgstr "多人聊天邀請"
 
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "遠端聯絡人停止了傳輸"
 
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "開啟檔案錯誤"
 
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
 msgid "File transfer stopped"
 msgstr "檔案傳輸已停止"
 
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
 #: gajim/gtk/filetransfer.py:284
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
 msgid "Connection with peer cannot be established."
 msgstr "無法與對方建立連線。"
 
-#: gajim/application.py:79
+#: gajim/application.py:80
 #, fuzzy
 msgid "Show the application's version"
 msgstr "在通知區域顯示圖示:"
 
-#: gajim/application.py:86
+#: gajim/application.py:87
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "只顯示在聯絡人清單中"
 
-#: gajim/application.py:93
+#: gajim/application.py:94
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:102
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:108
+#: gajim/application.py:109
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "進階設定編輯器"
 
-#: gajim/application.py:116
+#: gajim/application.py:117
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s 設定錯誤"
 
-#: gajim/application.py:124
+#: gajim/application.py:125
 #, fuzzy
 msgid "Configure logging system"
 msgstr "組配 %s"
 
-#: gajim/application.py:132
+#: gajim/application.py:133
 #, fuzzy
 msgid "Show all warnings"
 msgstr "顯示所有未處理事件(_E)"
 
-#: gajim/application.py:139
+#: gajim/application.py:140
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:146
+#: gajim/application.py:147
 msgid "Pops up a window with the next pending event"
 msgstr "為下一筆未處理事件彈出視窗"
 
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "開始聊天"
 
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
 msgid "Database Error"
 msgstr "資料庫錯誤"
 
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
 msgid "Merged accounts"
 msgstr "已合併的帳號"
 
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
 msgid "Transports"
 msgstr "服務代理"
 
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
 #: gajim/common/helpers.py:96
 #, fuzzy
 msgid "Group chats"
 msgstr "多人聊天"
 
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
 #, fuzzy
 msgid "Authorization sent"
 msgstr "授權傳送成功"
 
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "現在\"%s\"將知道您的狀態。"
 
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
 msgid "Subscription request has been sent"
 msgstr "認證請求已發出"
 
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know their status."
 msgstr "如果\"%s\"接受此請求，您將知道他/她的狀態。"
 
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
 #, fuzzy
 msgid "Authorization removed"
 msgstr "授權被移除"
 
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 將一直看到您的狀態為離線。"
@@ -1415,7 +1412,7 @@ msgstr "\"%s\" 將一直看到您的狀態為離線。"
 msgid "desynced"
 msgstr "未同步"
 
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
@@ -1435,7 +1432,8 @@ msgid "_Always quit when closing Gajim"
 msgstr "總是關閉 Gajim"
 
 #: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
@@ -1584,8 +1582,8 @@ msgstr "重新命名群組"
 msgid "Please enter a new name"
 msgstr "請用您想要的名稱新增一個主題。"
 
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
 #, fuzzy
 msgid "_Rename"
 msgstr "重新命名(_N)"
@@ -1604,27 +1602,32 @@ msgstr "您想從聯絡人清單中刪除組 %s ?"
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "同時從聯絡人清單移除這個群組的所有聯絡人"
 
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "離開聊天室"
+
+#: gajim/roster_window.py:3045
 #, fuzzy
 msgid "Please enter a new name for this group chat"
 msgstr "<b>請在您本地帳號填寫新的使用者名稱</b>"
 
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
 #, fuzzy
 msgid "Remove Contact"
 msgstr "重新命名聯絡人"
 
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
 #, fuzzy, python-format
 msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
 msgstr "您將從您的聯絡人清單中將 \"%(name)s\" (%(jid)s) 移除。\n"
 
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1633,21 +1636,21 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
 msgid "Do you want to continue?"
 msgstr "您要繼續嗎?"
 
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "我想讓此聯絡人在被移除之後仍然知道我的狀態"
 
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1658,24 +1661,24 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "重新命名聯絡人"
 
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
 msgid "No account available"
 msgstr "沒有有效帳號"
 
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必須在與他人聊天前新增帳號。"
 
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的伺服器不支援儲存元聯絡人資訊"
 
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1683,12 +1686,12 @@ msgid ""
 msgstr ""
 "您的伺服器不支援儲存元聯絡人資訊。所以這些資訊在下次重新連線時不會被儲存。"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "您在建立一個元聯絡人。確定繼續?"
 
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1698,120 +1701,121 @@ msgstr ""
 "元聯絡人是將幾個聯絡人組合起來顯示在同一列。一般在某個人有幾個 Jabber\n"
 "帳號或代理帳號時用到。"
 
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "重新命名聯絡人"
 
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "創造"
 
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
 msgid "Invalid file URI:"
 msgstr "無效的檔案位址:"
 
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
 #, fuzzy, python-format
 msgid "Send this file to %s:\n"
 msgid_plural "Send these files to %s:\n"
 msgstr[0] "您想要將檔案傳送給 %s 嗎:"
 
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "傳送 %s 給 %s"
 
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
 #, python-format
 msgid "Make %s first contact"
 msgstr "將 %s 設為第一聯絡人"
 
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "將 %s 與 %s 設為中繼聯絡人"
 
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
 msgid "_Change Status Message"
 msgstr "變更狀態訊息(_C)"
 
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
 msgid "Publish Tune"
 msgstr "發布音樂"
 
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
 msgid "Publish Location"
 msgstr "發布位置資訊"
 
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
 msgid "_Maximize All"
 msgstr "放到最大全部(_M)"
 
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
 msgid "Send Group M_essage"
 msgstr "傳送群組訊息(_E)"
 
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
 msgid "To all users"
 msgstr "向所有的使用者"
 
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
 msgid "To all online users"
 msgstr "向所有線上使用者"
 
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "邀請到(_V)"
 
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
 msgid "_Manage Contacts"
 msgstr "管理聯絡人(_M)"
 
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "編輯群組(_G)"
 
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
 #: gajim/gtk/dialogs.py:68
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
 msgid "_Maximize"
 msgstr "放到最大(_M)"
 
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
 #, fuzzy
 msgid "Re_name"
 msgstr "重新命名(_N)"
 
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "重新連線(_R)"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "執行命令(_E)…"
 
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
 msgid "_History"
 msgstr "命令歷程(_H)"
 
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "命令歷程記錄管理器"
 
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "旁觀者"
 
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
 msgid "Observers can see your status, but you are not allowed to see theirs"
 msgstr ""
 
@@ -1938,70 +1942,70 @@ msgstr "私人聊天"
 msgid "Messages"
 msgstr "訊息"
 
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 認證"
 
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
 msgid "Do you accept this request?"
 msgstr "是否接受這個請求?"
 
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
 #, fuzzy, python-format
 msgid "Do you accept this request (account: %s)?"
 msgstr "是否接受這個對帳號 %s 的請求?"
 
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
 #, fuzzy
 msgid "Authorization Request"
 msgstr "授權傳送成功"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
 #, fuzzy
 msgid "HTTP Authorization Request"
 msgstr "授權傳送成功"
 
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
 #: gajim/gtk/filetransfer.py:339
 #, fuzzy
 msgid "_No"
 msgstr "No"
 
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
 msgid "Connection Failed"
 msgstr "連線失敗"
 
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
 
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
 msgid "Subscription request"
 msgstr "認證請求"
 
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
 msgid "Authorization accepted"
 msgstr "授權被接受"
 
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "聯絡人\"%s\"已授權您檢視他/她的狀態。"
 
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
 #, fuzzy
 msgid "Subscription Removed"
 msgstr "認證請求"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
 #, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
 msgstr "聯絡人\"%s\"移除了對您的認證"
 
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
 #, fuzzy
 msgid ""
 "You will always see this contact as offline.\n"
@@ -2010,148 +2014,148 @@ msgstr ""
 "您將一直看到他/她處於離線狀態。\n"
 "要將他/她從您的聯絡人清單中移除嗎?"
 
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
 msgid "Unsubscribed"
 msgstr "已取消認證的"
 
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "您被邀請到一個聊天室"
 
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
 msgid "Certificate Passphrase Required"
 msgstr "要求憑證密語"
 
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "輸入密語用於帳號憑證 %s"
 
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "輸入帳號 %s 的密碼"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Password Required"
 msgstr "需要密碼"
 
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
 msgid "File Transfer Error"
 msgstr "檔案傳輸錯誤"
 
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想傳送給您一個檔案。"
 
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
 msgid "File Transfer Request"
 msgstr "檔案傳輸請求"
 
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "遠端聯絡人停止了傳輸"
 
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
 #, fuzzy
 msgid "Error Opening File"
 msgstr "開啟檔案錯誤"
 
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL證書錯誤"
 
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
 msgid "File Transfer Stopped"
 msgstr "檔案傳輸已停止"
 
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "檔案傳輸完成"
 
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的給 %(name)s 傳送了檔案 %(filename)s。"
 
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
 msgid "Username Conflict"
 msgstr "使用者名稱衝突"
 
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
 #, fuzzy
 msgid "Please enter a new username for your local account"
 msgstr "<b>請在您本地帳號填寫新的使用者名稱</b>"
 
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
 #: gajim/gtk/dialogs.py:49
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要發起語音聊天。"
 
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
 msgid "Voice Chat Request"
 msgstr "語音聊天請求"
 
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
 #, fuzzy
 msgid "Insecure Connection"
 msgstr "不安全的連線"
 
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2161,20 +2165,20 @@ msgstr ""
 "您即將透過不安全的連線與帳號 %(account)s (%(server)s) 連接。這意味著您的所有"
 "對話都會不經加密地被交換。您確定要這樣做嗎？"
 
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
 msgid "_Abort"
 msgstr ""
 
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
 #, fuzzy
 msgid "_Connect Anyway"
 msgstr "正在連線"
 
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
 msgid "Could not save your settings and preferences"
 msgstr "無法儲存您的設定。"
 
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
 msgid "Gajim: IPython Console"
 msgstr ""
 
@@ -2375,11 +2379,11 @@ msgstr ""
 msgid "Avatar Upload Failed"
 msgstr "vCard 發布失敗"
 
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
 msgid "Sending private message failed"
 msgstr "傳送私有訊息失敗"
 
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已離開。"
@@ -2700,77 +2704,72 @@ msgstr ""
 "參數 \"%(arg)s\" 未指定。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一個目錄但它應該是一個檔案"
 
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "正在銷毀 %s"
 
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "不明的 SSL 錯誤: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
 msgid "New Private Message"
 msgstr "新個人訊息"
 
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
 #, fuzzy, python-format
 msgid "New message from %(nickname)s"
 msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
 msgstr[0] "來自 %(nickname)s 的新訊息"
 
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
 #, fuzzy
 msgid "New Group Chat Message"
 msgstr "新聊天室"
 
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 變更了狀態"
 
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的狀態是 %(status)s"
 
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
 msgid "Contact Changed Status"
 msgstr "聯絡人狀態變更"
 
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上線了"
 
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
 msgid "Contact Signed In"
 msgstr "聯絡人登入"
 
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 離開了"
 
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
 msgid "Contact Signed Out"
 msgstr "聯絡人離開登入"
 
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
 #, fuzzy
 msgid "Authentication failed"
 msgstr "\"%s\"登入驗證失敗"
@@ -2839,63 +2838,21 @@ msgstr "即使系統匣圖示未顯示，仍然允許隱藏名冊視窗。"
 
 #: gajim/common/config.py:93
 #, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "提醒我聯絡人登入(_I)"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "提醒我聯絡人登出(_O)"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "在彈出提示中預覽訊息?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "檔案傳輸完成時提醒我(_N)"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "檔案傳輸完成時提醒我(_N)"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "當聯絡人剛剛登入時的背景色。"
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
 msgid ""
 "List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "折疊的列(帳號和組)的清單(空格分隔)。"
 
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
 msgid "default"
 msgstr "預設"
 
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Language used for spell checking."
 msgstr "拼寫檢查的語言"
 
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2905,47 +2862,47 @@ msgstr ""
 "'有時' - 如 iChat 風格每隔幾分鐘顯示時間。\n"
 "'永遠不' - 永遠不顯示時間。"
 
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
 msgstr ""
 
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "將成對出現的 * / _ 視為可能的格式控制字元。"
 
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
 #, fuzzy
 msgid ""
 "If enabled, do not remove */_ . So *abc* will be bold but with * * not "
 "removed."
 msgstr "如果為真，則不移除 */_。這樣 *abc* 將被加粗但 * * 不會被移除。"
 
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
 #, fuzzy
 msgid ""
 "Character to add after nickname when using nickname completion (tab) in "
 "group chat."
 msgstr "當在多人聊天中使用暱稱補全(Tab)時加到暱稱後的字元。"
 
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
 #, fuzzy
 msgid ""
 "Character to propose to add after desired nickname when nickname is already "
 "used in group chat."
 msgstr "當請求的暱稱被聊天室中的其他人使用時加到請求的暱稱後的字元。"
 
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
 #, fuzzy
 msgid ""
 "If enabled, Gajim will save the contact list window position when hiding it, "
 "and restore it when showing the contact list window again."
 msgstr "如果為真，當隱藏名冊時 Gajim 將會儲存名冊位置，並於顯示名冊時還原。"
 
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
 msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
 #, fuzzy
 msgid ""
 "This option lets you customize the timestamp that is printed in "
@@ -2957,51 +2914,51 @@ msgstr ""
 "\"[小時:分鐘]\"。請參考 Python doc 關於 strftime 的文件:\n"
 "http://docs.python.org/lib/module-time.html"
 
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
 #, fuzzy
 msgid "Characters that are printed before the nickname in conversations."
 msgstr "在對話中顯示在暱稱前的字元"
 
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
 #, fuzzy
 msgid "Characters that are printed after the nickname in conversations."
 msgstr "在對話中顯示在暱稱後的字元"
 
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
 #, fuzzy
 msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的心情。"
 
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
 #, fuzzy
 msgid ""
 "Number of messages from chat history to be restored when a chat tab/window "
 "is reopened."
 msgstr "聊天標籤/視窗被重新開啟時顯示之前進行的對話的最後多少列。"
 
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
 msgid ""
 "How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
 #, fuzzy
 msgid ""
 "How many seconds to wait before trying to automatically rejoin a group chat "
 "you were disconnected from. Set to 0 to disable automatic rejoining."
 msgstr "自動重新加入一個中斷的聊天室前等待多少秒。設為 0 以停用自動重新加入。"
 
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
 #, fuzzy
 msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "用 Ctrl+Enter 傳送訊息，Enter 開始新列(紫茉莉 ICQ 客戶端預設作業)。"
 
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
 #, fuzzy
 msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "為 Ctrl+KeyUP 儲存多少列。"
 
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
 #, fuzzy, python-format
 msgid ""
 "Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -3009,26 +2966,26 @@ msgid ""
 msgstr ""
 "自訂位址，在其中應包含 %s，%s 是單字/片語; 或'WIKTIONARY'以使用 wiktionary。"
 
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果選取，Gajim 可以被 gajim-remote 遠端控制。"
 
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
 #, fuzzy
 msgid ""
 "When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr "當不是每條訊息都顯示時間('有時'顯示時間)時，每多少分鐘顯示時間。"
 
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
 msgid "Ask before closing a group chat tab/window."
 msgstr "關閉多人聊天標籤/視窗前詢問。"
 
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
 #, fuzzy
 msgid ""
 "Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3037,7 +2994,7 @@ msgstr ""
 "如果有可能丟失資料的控制項(不會被最小化的聊天，私人聊天，多人聊天)，在關\n"
 "閉有標籤的視窗前詢問。"
 
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
 #, fuzzy
 msgid ""
 "List of send hosts (comma separated) in addition to local interfaces for "
@@ -3046,38 +3003,38 @@ msgstr ""
 "逗號分割的清單。在有位址翻譯/連接埠轉發的情況下，除了本地介面，還將向其中\n"
 "的主機傳送檔案傳輸請求。"
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規定 1 KiB = 1024 bytes(位元組)，1 KB = 1000 bytes。"
 
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
 msgid "Notify of events in the notification area."
 msgstr "在通知區域中提示事件"
 
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
 msgid "Show tab when only one conversation?"
 msgstr "只有一個對話時顯示標籤?"
 
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天視窗中顯示標籤組的邊框。"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
 msgid "Show close button in tab?"
 msgstr "在標籤上顯示關閉按鈕?"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
 msgid "Preview new messages in notification popup?"
 msgstr "在彈出提示中預覽訊息?"
 
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
 #, fuzzy
 msgid ""
 "A list of words (semicolon separated) that will be highlighted in group "
 "chats."
 msgstr "用分號隔開的在多人聊天中將高亮度顯示的單字清單。"
 
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
 #, fuzzy
 msgid ""
 "If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3087,22 +3044,13 @@ msgstr ""
 "如果為真，按一下視窗管理器的 X 按鈕會離開 Gajim。此一設定僅當啟用通知區域圖示"
 "時會生效。"
 
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
 msgid ""
 "If enabled, Gajim hides the contact list window when pressing the X button "
 "instead of minimizing into the notification area."
 msgstr ""
 
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"如果為真， Gajim 會在每個含有未讀訊息的標籤上顯示一個圖示。根據主題，該圖示可"
-"能是動態的。"
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3111,13 +3059,13 @@ msgstr ""
 "如果為真， Gajim 將在聯絡人清單視窗中每一個聯絡人名稱的下方顯示狀態資訊(如果"
 "不為空)。"
 
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
 "Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "定義了在聯絡人清單中頭像的顯示位置。可以是左或右"
 
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
 "If disabled, Gajim will no longer print status messages in chats when a "
@@ -3126,26 +3074,26 @@ msgstr ""
 "如果為假，Gajim 將不會在聯絡人的狀態或狀態訊息變化時在聊天視窗中顯示一列提"
 "示。"
 
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
 "chat."
 msgstr "無法加入聊天室"
 
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for all status changes (away, dnd, "
 "etc.) of users in a group chat."
 msgstr "無法加入聊天室"
 
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
 #, fuzzy
 msgid "Don't show contact list window in the system taskbar."
 msgstr "不要將聯絡人清單視窗顯示在系統的工作列中。"
 
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
 #, fuzzy
 msgid ""
 "If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3154,7 +3102,7 @@ msgstr ""
 "如果為真並且安裝的 GTK+ 和 PyGTK 的版本至少為 2.8，當有未處理事件時使窗\n"
 "口閃爍(大部分視窗管理器的預設回應)"
 
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3174,7 +3122,7 @@ msgstr ""
 "'peracct' - 每個帳號的訊息傳送到一個單獨的視窗。\n"
 "'pertype' - 每種類型的訊息 (例如，聊天 及 多人聊天) 傳送到一個單獨的視窗。"
 
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
 #, fuzzy
 msgid ""
 "Show contact list window on startup.\n"
@@ -3187,32 +3135,32 @@ msgstr ""
 "「永不」- 永不顯示名冊。\n"
 "「last_state」- 還原最後狀態名冊。"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
 #, fuzzy
 msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "如果為假，您將不會在視窗中看到頭像。"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
 #, fuzzy
 msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "如果為真，按 Escape 鍵將關閉標籤/視窗。"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Hides the banner in a group chat window."
 msgstr "在多人聊天視窗中隱藏標語"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Hides the banner in a 1:1 chat window."
 msgstr "在多人聊天視窗中隱藏標語"
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Hides the group chat participants list in a group chat window."
 msgstr "在多人聊天視窗中隱藏室友清單。"
 
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3220,32 +3168,32 @@ msgid ""
 msgstr ""
 "在聊天中，只在目前一條訊息不是由同一個人發出的的時候才在一列前顯示暱稱。"
 
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
 msgid "Indentation when using merge consecutive nickname."
 msgstr "當合併連續暱稱時縮排。"
 
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
 #, fuzzy
 msgid ""
 "Ctrl+Tab switches to the next composing tab when there are no tabs with "
 "messages pending."
 msgstr "當所有分頁中沒有未讀訊息時按 Ctrl-Tab 轉到下一個正在編輯的標籤。"
 
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to create metacontacts? Empty string means never "
 "show the dialog."
 msgstr "是否顯示確認阻斷聯絡人對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
 #, fuzzy
 msgid ""
 "Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr "是否顯示確認阻斷聯絡人對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
 #, fuzzy
 msgid ""
 "If enabled, you will be able to set a negative priority to your account in "
@@ -3255,14 +3203,14 @@ msgstr ""
 "如果為真，您將可以在修改帳號視窗中為您的帳號可以設定一個負的優先等級。注意!當"
 "您使用負的優先等級登入時您將不能從伺服器收到任何訊息。"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show both the number of online and total contacts in "
 "account rows as well as in group rows."
 msgstr "如果為真，Gajim 會在帳號和群組所在列顯示線上和總共聯絡人數目。"
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
 #, fuzzy
 msgid ""
 "If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3270,21 +3218,17 @@ msgid ""
 msgstr ""
 "如果為真，在聊天視窗沒有開啟時，Gajim 會捲動並選出最後給您傳送訊息的聯絡人。"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "時間，如果在此時間內沒有活動，將變更狀態視窗關閉。"
 
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "在對話中最多顯示的列數。最舊的那些列會被清除。"
 
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "兩次檢查閒置之間的時間間隔。"
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
 #, fuzzy
 msgid ""
 "Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3293,27 +3237,27 @@ msgstr ""
 "合法的 URI Scheme。只有這個清單中的 Scheme 會被接受為\"真正的\" URI。(mailto "
 "和 xmpp 被分開處理)"
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
 #, fuzzy
 msgid ""
 "If enabled, completion in group chats will be like a shell auto-completion."
 msgstr "如果為真，多人聊天中會像 shell 一樣自動補全"
 
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
 #, fuzzy
 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr "可選地修正 jingle 視訊輸出的圖框速率。比如: 10/1 或 25/2"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
 #, fuzzy
 msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "可選地縮放 jingle 視訊輸出尺寸。比如: 320x240"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
 msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
 #, fuzzy
 msgid ""
 "If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3322,145 +3266,145 @@ msgstr ""
 "如果為真，Gajim 在使用 jingle 時會嘗試使用 STUN 伺服器。伺服器可以由"
 "\"stun_server\"選項給出，或由 jabber 伺服器給出。"
 
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "在使用 jingle 時使用的 STUN 伺服器"
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
 #, fuzzy
 msgid ""
 "If enabled, Gajim will show affiliation of group chat participants by adding "
 "a colored square to the status icon."
 msgstr "如果為真，Gajim 會在聊天室室友的狀態圖示上加上一個彩色方框以示歸屬"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
 "If enabled, Gajim will display an icon to show that sent messages have been "
 "received by your contact."
 msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
 
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr "如果為真，Gajim 會使用 Gnome Keyring (如果可用) 儲存帳號的密碼。"
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
 msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
 msgid ""
 "Maximum history in days we request from a public group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
 msgid ""
 "Maximum history in days we request from a private group chat archive. 0: As "
 "much as possible."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
 msgid ""
 "If enabled, Gajim shows the group chat subject in the chat window when "
 "joining."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
 #, fuzzy
 msgid ""
 "If enabled, the contact row is colored according to the current chat state "
 "of the contact."
 msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
 #, fuzzy
 msgid ""
 "If enabled, the tab is colored according to the current chat state of the "
 "contact."
 msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
 #, fuzzy
 msgid ""
 "Shows a text in the banner that describes the current chat state of the "
 "contact."
 msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only', 'disabled'"
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
 msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
 msgid "Selecting text will copy it to the clipboard"
 msgstr ""
 
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
 msgstr ""
 
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
 msgid "Width of group chat roster in pixel"
 msgstr ""
 
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Force Bookmark 2 usage"
 msgstr "將本聊天室加入書籤(_B)"
 
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in 'autopriority_*' options."
 msgstr "優先等級將根據您的狀態自動變更。優先等級在 autopriority_* 選項中定義。"
 
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
 #, fuzzy
 msgid ""
 "Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3471,59 +3415,59 @@ msgstr ""
 "\"，\"請勿\n"
 "打擾\"，\"隱身\"。注意: 僅當 restore_last_status 被停用時這個選項其作用"
 
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
 #, fuzzy
 msgid "If enabled, the last status will be restored."
 msgstr "如果啟用，則恢復上次使用的狀態。"
 
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
 #, fuzzy
 msgid ""
 "If enabled, contacts requesting authorization will be accepted automatically."
 msgstr "如果為真，聯絡人的認證請求將被自動接受。"
 
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
 #, fuzzy
 msgid ""
 "If disabled, this account will be disabled and will not appear in the "
 "contact list window."
 msgstr "如果為假，這個帳號將被停用且不會出現在聯絡人清單視窗中。"
 
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
 #, fuzzy
 msgid "Use an unencrypted connection to the server"
 msgstr "尚未連線到伺服器"
 
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', or 'none'."
 msgstr "在使用明文連線傳送密碼前顯示一個警告對話方塊。"
 
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
 msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
 msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
 msgstr ""
 
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
 msgid ""
 "List of XMPP Addresses (space separated) for which you do not want to store "
 "chat history. You can also add the name of an account to disable storing "
 "chat history for this account."
 msgstr ""
 
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of a ping alive packet before trying "
 "to reconnect."
 msgstr "在重新連線前等待 ping alive packet 的回應多少秒"
 
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
 #, fuzzy
 msgid ""
 "If enabled, Gajim will use your IP and proxies defined in "
@@ -3532,32 +3476,32 @@ msgstr ""
 "如果選取，Gajim 會使用您在 file_transfer_proxies 選項中定義的 IP 和代理進行檔"
 "案傳輸。"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
 msgid ""
 "If enabled, Gajim will test file transfer proxies on startup to be sure they "
 "work. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
 #, fuzzy
 msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "允許 Gajim 發送您正在執行的作業系統相關資訊。"
 
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
 msgid "Allow Gajim to send your local time."
 msgstr "允許 Gajim 發送您的本地時間。"
 
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
 #, fuzzy
 msgid "Message that is sent to contacts you want to add."
 msgstr "向您希望加入的聯絡人傳送的訊息"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
 "If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3566,76 +3510,72 @@ msgstr ""
 "如果選取，Gajim 會使用您在 file_transfer_proxies 選項中定義的 IP 和代理進行檔"
 "案傳輸。"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
 msgid ""
 "List of XMPP Addresses (space separated) for which the chat window will be "
 "re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on a chat window. Can "
 "be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
 #, fuzzy
 msgid "Allow certificate verification with POSH."
 msgstr "SSL 憑證驗證"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: 'all', "
 "'composing_only', 'disabled'"
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
 #, fuzzy
 msgid "The currently active encryption for that contact."
 msgstr "為這個帳號啟用 ESession 加密。"
 
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
 msgid ""
 "If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
 #, fuzzy
 msgid ""
 "Show a status message for all status changes (away, dnd, etc.) of users in a "
 "group chat."
 msgstr "無法加入聊天室"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
 #, fuzzy
 msgid "Show a status message for every join or leave in a group chat."
 msgstr "無法加入聊天室"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
 msgid ""
 "If enabled, the group chat is minimized into the contact list when joining "
 "automatically."
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
 msgid ""
 "If enabled, the group chat is minimized into the contact list when closing "
 "it."
 msgstr ""
 
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
 "'all', 'composing_only' or 'disabled'."
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
 #, fuzzy
 msgid ""
 "If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3645,84 +3585,84 @@ msgstr ""
 "表述在離開時是否啟用外掛程式(在 Gajim 離開時這會被儲存)。這個選項不應該用於啟"
 "用或停用外掛程式。使用圖形介面代替。"
 
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
 msgid "Sleeping"
 msgstr "正在睡覺"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back soon"
 msgstr "馬上回來"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
 msgid "Back in some minutes."
 msgstr "幾分鐘就回來。"
 
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
 msgid "Eating"
 msgstr "吃東西"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
 #, fuzzy
 msgid "I'm eating."
 msgstr "我正在工作。"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "Movie"
 msgstr "電影"
 
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
 msgid "I'm watching a movie."
 msgstr "我正在看電影。"
 
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
 msgid "Working"
 msgstr "工作"
 
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "Phone"
 msgstr "打電話"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
 msgid "I'm on the phone."
 msgstr "我正在打電話"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "Out"
 msgstr "外出"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
 msgid "I'm out enjoying life."
 msgstr "我正在享受戶外生活。"
 
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
 msgid "I'm available."
 msgstr "我現在線上。"
 
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
 msgid "Be right back."
 msgstr "很快回來。"
 
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
 msgid "I'm not available."
 msgstr "我已經很久不在了。"
 
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
 msgid "Do not disturb."
 msgstr "請勿打擾。"
 
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
 msgid "Bye!"
 msgstr "再見!"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -3730,1061 +3670,1061 @@ msgid ""
 msgstr ""
 "當收到的多人聊天訊息包含 \"muc_highlight_words\" 或您的暱稱時播放的聲音。"
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
 #, fuzzy
 msgid "Sound to play when any group chat message arrives."
 msgstr "收到任意多人聊天訊息播放的聲音。"
 
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
 #, fuzzy
 msgid "Tor"
 msgstr "To"
 
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "錯誤: 無法按讀開啟檔案 %s"
 
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
 #, fuzzy
 msgid "?Group chat name:Team"
 msgstr "無"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
 msgid "?Group chat description:Project discussion"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
 #, fuzzy
 msgid "?Group chat address:team"
 msgstr "多人聊天"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "?Group chat name:Family"
 msgstr "多人聊天訊息高亮度顯示"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
 msgid "?Group chat description:Spring gathering"
 msgstr ""
 
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
 msgid "?Group chat address:family"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
 #, fuzzy
 msgid "?Group chat name:Vacation"
 msgstr "多人聊天邀請"
 
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
 msgid "?Group chat description:Trip planning"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
 #, fuzzy
 msgid "?Group chat address:vacation"
 msgstr "多人聊天邀請"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "?Group chat name:Repairs"
 msgstr "多人聊天(_G)"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
 msgid "?Group chat description:Local help group"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "?Group chat address:repairs"
 msgstr "多人聊天"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "?Group chat name:News"
 msgstr "無"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "?Group chat description:Local news and reports"
 msgstr "聊天室建立是受限的。"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "?Group chat address:news"
 msgstr "新聊天室"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
 #, fuzzy
 msgid "Remote server not found"
 msgstr "找不到該服務"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
 msgid "Remote server timeout"
 msgstr ""
 
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
 #, fuzzy
 msgid "Address does not belong to a group chat server"
 msgstr "這不是一個聊天室"
 
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
 #, fuzzy
 msgid "Group chat already exists"
 msgstr "帳號本地已存在。"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
 #, fuzzy
 msgid "Group chat does not exist"
 msgstr "多人聊天 <b>%s</b> 不存在。"
 
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
 #, fuzzy
 msgid "Group chat is closed"
 msgstr "多人聊天命令歷程"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
 "You can install the OpenPGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
 msgid "Doing Chores"
 msgstr "做家務"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
 msgid "Buying Groceries"
 msgstr "買雜貨"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
 msgid "Cleaning"
 msgstr "清潔"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
 msgid "Cooking"
 msgstr "做飯"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
 msgid "Doing Maintenance"
 msgstr "做保養"
 
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
 msgid "Doing the Dishes"
 msgstr "洗碗"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
 msgid "Doing the Laundry"
 msgstr "洗衣服"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
 msgid "Gardening"
 msgstr "園藝"
 
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
 msgid "Running an Errand"
 msgstr "奔波"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
 msgid "Walking the Dog"
 msgstr "遛狗"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
 msgid "Drinking"
 msgstr "喝酒"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
 msgid "Having a Beer"
 msgstr "喝啤酒"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
 msgid "Having Coffee"
 msgstr "喝咖啡"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
 msgid "Having Tea"
 msgstr "喝茶"
 
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
 msgid "Having a Snack"
 msgstr "吃點心"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
 msgid "Having Breakfast"
 msgstr "吃早餐"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
 msgid "Having Dinner"
 msgstr "吃晚餐"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
 msgid "Having Lunch"
 msgstr "吃午餐"
 
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
 msgid "Exercising"
 msgstr "鍛煉"
 
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
 msgid "Cycling"
 msgstr "騎車"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
 msgid "Dancing"
 msgstr "跳舞"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
 msgid "Hiking"
 msgstr "步行"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
 msgid "Jogging"
 msgstr "慢跑"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
 msgid "Playing Sports"
 msgstr "運動"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
 msgid "Running"
 msgstr "跑步"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
 msgid "Skiing"
 msgstr "滑雪"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
 msgid "Swimming"
 msgstr "游泳"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
 msgid "Working out"
 msgstr "鍛煉"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
 msgid "Grooming"
 msgstr "打扮"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
 msgid "At the Spa"
 msgstr "泡溫泉"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
 msgid "Brushing Teeth"
 msgstr "刷牙"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
 msgid "Getting a Haircut"
 msgstr "剪頭發"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
 msgid "Shaving"
 msgstr "颳鬍子"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
 msgid "Taking a Bath"
 msgstr "洗澡"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
 msgid "Taking a Shower"
 msgstr "洗澡"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
 msgid "Having an Appointment"
 msgstr "赴約"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
 msgid "Inactive"
 msgstr "未活動的"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
 msgid "Day Off"
 msgstr "休息日"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
 msgid "Hanging out"
 msgstr "溜達"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
 msgid "Hiding"
 msgstr "藏起來"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
 msgid "On Vacation"
 msgstr "渡假"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
 msgid "Praying"
 msgstr "祈禱"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
 msgid "Scheduled Holiday"
 msgstr "規劃假期"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
 msgid "Thinking"
 msgstr "思考"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
 msgid "Relaxing"
 msgstr "放鬆"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
 msgid "Fishing"
 msgstr "釣魚"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
 msgid "Gaming"
 msgstr "遊戲"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
 msgid "Going out"
 msgstr "外出"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
 msgid "Partying"
 msgstr "聚會"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
 msgid "Reading"
 msgstr "讀書"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
 msgid "Rehearsing"
 msgstr "排練"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
 msgid "Shopping"
 msgstr "購物"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
 msgid "Smoking"
 msgstr "抽煙"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
 msgid "Socializing"
 msgstr "社交"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
 msgid "Sunbathing"
 msgstr "日光浴"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
 msgid "Watching TV"
 msgstr "看電視"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
 msgid "Watching a Movie"
 msgstr "看電影"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
 msgid "Talking"
 msgstr "談話"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
 msgid "In Real Life"
 msgstr "在現實世界中"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
 msgid "On the Phone"
 msgstr "打電話"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
 msgid "On Video Phone"
 msgstr "視訊電話"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
 msgid "Traveling"
 msgstr "旅行"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
 msgid "Commuting"
 msgstr "上下班"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
 msgid "Driving"
 msgstr "開車"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
 msgid "In a Car"
 msgstr "坐車"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
 msgid "On a Bus"
 msgstr "坐公共汽車"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
 msgid "On a Plane"
 msgstr "坐飛機"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
 msgid "On a Train"
 msgstr "坐火車"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
 msgid "On a Trip"
 msgstr "旅途"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
 msgid "Walking"
 msgstr "走路"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
 msgid "Coding"
 msgstr "編寫程式碼"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
 msgid "In a Meeting"
 msgstr "開會"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
 msgid "Studying"
 msgstr "學習"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
 msgid "Writing"
 msgstr "寫作"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
 msgid "Afraid"
 msgstr "害怕"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
 msgid "Amazed"
 msgstr "大為驚奇"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
 msgid "Amorous"
 msgstr "含情脈脈"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
 msgid "Angry"
 msgstr "生氣"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
 msgid "Annoyed"
 msgstr "惱怒"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
 msgid "Anxious"
 msgstr "焦慮"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
 msgid "Aroused"
 msgstr "激情澎湃"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
 msgid "Ashamed"
 msgstr "羞愧"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
 msgid "Bored"
 msgstr "厭倦"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
 msgid "Brave"
 msgstr "勇敢"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
 msgid "Calm"
 msgstr "冷靜"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
 msgid "Cautious"
 msgstr "謹慎"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
 msgid "Cold"
 msgstr "冰冷"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
 msgid "Confident"
 msgstr "自信"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
 msgid "Confused"
 msgstr "困惑"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
 msgid "Contemplative"
 msgstr "沉思，冥想"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
 msgid "Contented"
 msgstr "爭辯"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
 msgid "Cranky"
 msgstr "古怪"
 
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
 msgid "Crazy"
 msgstr "瘋狂"
 
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
 msgid "Creative"
 msgstr "創造"
 
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
 msgid "Curious"
 msgstr "好奇"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
 msgid "Dejected"
 msgstr "沮喪"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
 msgid "Depressed"
 msgstr "消沉"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
 msgid "Disappointed"
 msgstr "失望"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
 msgid "Disgusted"
 msgstr "厭惡"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
 msgid "Dismayed"
 msgstr "詫異"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
 msgid "Distracted"
 msgstr "心煩意亂"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
 msgid "Embarrassed"
 msgstr "尷尬"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
 msgid "Envious"
 msgstr "羨慕"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
 msgid "Excited"
 msgstr "興奮"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
 msgid "Flirtatious"
 msgstr "賣弄風情"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
 msgid "Frustrated"
 msgstr "懊喪"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
 msgid "Grateful"
 msgstr "感激"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
 msgid "Grieving"
 msgstr "悲傷"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
 msgid "Grumpy"
 msgstr "暴躁"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
 msgid "Guilty"
 msgstr "內疚"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
 msgid "Happy"
 msgstr "快樂"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
 msgid "Hopeful"
 msgstr "滿懷希望"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
 msgid "Hot"
 msgstr "活躍"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
 msgid "Humbled"
 msgstr "謙遜"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
 msgid "Humiliated"
 msgstr "丟臉"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
 msgid "Hungry"
 msgstr "餓"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
 msgid "Hurt"
 msgstr "受傷"
 
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
 msgid "Impressed"
 msgstr "印像深刻"
 
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
 msgid "In Awe"
 msgstr "敬畏"
 
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
 msgid "In Love"
 msgstr "戀愛"
 
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
 msgid "Indignant"
 msgstr "憤慨"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
 msgid "Interested"
 msgstr "感興趣"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
 msgid "Intoxicated"
 msgstr "麻醉"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
 msgid "Invincible"
 msgstr "無敵的"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
 msgid "Jealous"
 msgstr "吃醋"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
 msgid "Lonely"
 msgstr "寂寞"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
 msgid "Lost"
 msgstr "迷惘"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
 msgid "Lucky"
 msgstr "幸運"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
 msgid "Mean"
 msgstr "小氣"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
 msgid "Moody"
 msgstr "喜怒無常"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
 msgid "Nervous"
 msgstr "緊張"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
 msgid "Neutral"
 msgstr "中立"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
 msgid "Offended"
 msgstr "生氣"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
 msgid "Outraged"
 msgstr "義憤填膺"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
 msgid "Playful"
 msgstr "有趣"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
 msgid "Proud"
 msgstr "驕傲"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
 msgid "Relaxed"
 msgstr "放鬆"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
 msgid "Relieved"
 msgstr "寬慰"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
 msgid "Remorseful"
 msgstr "後悔"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
 msgid "Restless"
 msgstr "坐立不安"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
 msgid "Sad"
 msgstr "傷心"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
 msgid "Sarcastic"
 msgstr "諷刺"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
 msgid "Satisfied"
 msgstr "滿意"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
 msgid "Serious"
 msgstr "嚴肅"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
 msgid "Shocked"
 msgstr "震驚"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
 msgid "Shy"
 msgstr "害羞"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
 msgid "Sick"
 msgstr "不舒服"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
 msgid "Sleepy"
 msgstr "瞌睡"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
 msgid "Spontaneous"
 msgstr "心血來潮"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
 msgid "Stressed"
 msgstr "壓力很大"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
 msgid "Strong"
 msgstr "強壯"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
 msgid "Surprised"
 msgstr "驚訝"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
 msgid "Thankful"
 msgstr "感激"
 
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
 msgid "Thirsty"
 msgstr "渴"
 
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
 msgid "Tired"
 msgstr "累"
 
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
 msgid "Undefined"
 msgstr "未定義"
 
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
 msgid "Weak"
 msgstr "虛弱"
 
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
 msgid "Worried"
 msgstr "擔憂"
 
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
 #, fuzzy
 msgid "alt"
 msgstr "預設"
 
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
 #, fuzzy
 msgid "bearing"
 msgstr "海洋"
 
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
 #, fuzzy
 msgid "building"
 msgstr "藏起來"
 
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
 #, fuzzy
 msgid "country"
 msgstr "帳號"
 
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
 #, fuzzy
 msgid "countrycode"
 msgstr "帳號"
 
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
 #, fuzzy
 msgid "description"
 msgstr "描述"
 
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
 #, fuzzy
 msgid "error"
 msgstr "錯誤"
 
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
 #, fuzzy
 msgid "lon"
 msgstr "一"
 
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
 msgid "room"
 msgstr "聊天室"
 
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
 #, fuzzy
 msgid "street"
 msgstr "stream"
 
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
 msgid "Unable to get issuer certificate"
 msgstr "無法獲得發行者的證書"
 
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
 msgid "Unable to get certificate CRL"
 msgstr "無法獲得證書吊銷清單"
 
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
 msgid "Unable to decrypt certificate's signature"
 msgstr "無法解密證書籤名稱"
 
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
 msgid "Unable to decrypt CRL's signature"
 msgstr "無法解密證書吊銷清單的簽名"
 
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
 msgid "Unable to decode issuer public key"
 msgstr "無法解碼發行者的公鑰"
 
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
 msgid "Certificate signature failure"
 msgstr "證書籤名稱失敗"
 
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
 msgid "CRL signature failure"
 msgstr "吊銷證書清單簽名失敗"
 
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
 msgid "Certificate is not yet valid"
 msgstr "證書還未生效"
 
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
 msgid "Certificate has expired"
 msgstr "證書已過期"
 
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
 msgid "CRL is not yet valid"
 msgstr "證書吊銷清單還未生效"
 
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
 msgid "CRL has expired"
 msgstr "證書吊銷清單已過期"
 
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
 msgid "Format error in certificate's notBefore field"
 msgstr "格式錯誤，在證書的'不早於'欄位"
 
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
 msgid "Format error in certificate's notAfter field"
 msgstr "格式錯誤，在證書的'不遲於'欄位"
 
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'最後更新'欄位"
 
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'下次更新'欄位"
 
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
 msgid "Out of memory"
 msgstr "記憶體耗盡"
 
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
 msgid "Self signed certificate"
 msgstr "自簽名的證書"
 
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
 msgid "Self signed certificate in certificate chain"
 msgstr "自簽名的證書，在證書鏈中"
 
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
 msgid "Unable to get local issuer certificate"
 msgstr "無法獲得本地發行者證書"
 
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
 msgid "Unable to verify the first certificate"
 msgstr "無法驗證第一個證書"
 
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
 msgid "Certificate chain too long"
 msgstr "證書鏈太長"
 
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
 msgid "Certificate revoked"
 msgstr "證書已被吊銷"
 
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
 msgid "Invalid CA certificate"
 msgstr "無效的 CA 證書"
 
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
 msgid "Path length constraint exceeded"
 msgstr "超過了路徑長度限制"
 
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
 msgid "Unsupported certificate purpose"
 msgstr "不支援的證書用途"
 
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
 msgid "Certificate not trusted"
 msgstr "不被信任的證書"
 
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
 msgid "Certificate rejected"
 msgstr "證書被拒絕"
 
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
 msgid "Subject issuer mismatch"
 msgstr "Subject 與 發行者 不匹配"
 
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 與 subject key identifier 不匹配"
 
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 與 發行者序號 不匹配"
 
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
 msgid "Key usage does not include certificate signing"
 msgstr "密鑰用途中不包含證書籤名稱"
 
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
 msgid "Application verification failure"
 msgstr "應用程式驗證失敗"
 
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
 msgid "The signing certificate authority is not known"
 msgstr ""
 
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
 #, fuzzy
 msgid "The certificate has been revoked"
 msgstr "證書已被吊銷"
 
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
 msgid "The certificate does not match the expected identity of the site"
 msgstr ""
 
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
 msgid "The certificate’s algorithm is insecure"
 msgstr ""
 
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
 msgid "The certificate’s activation time is in the future"
 msgstr ""
 
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
 #, fuzzy
 msgid "Unknown validation error"
 msgstr "不明的 SSL 錯誤: %d"
 
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
 #, fuzzy
 msgid "The certificate has expired"
 msgstr "證書已過期"
 
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
 #, fuzzy
 msgid "Authentication aborted"
 msgstr "授權被接受"
 
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
 #, fuzzy
 msgid "Account disabled"
 msgstr "帳號被停用"
 
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
 #, fuzzy
 msgid "Credentials expired"
 msgstr "證書已過期"
 
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
 #, fuzzy
 msgid "Encryption required"
 msgstr "認證請求"
 
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
 #, fuzzy
 msgid "Authentication mechanism not supported"
 msgstr "不支援擴充"
 
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
 #, fuzzy
 msgid "Authentication mechanism too weak"
 msgstr "\"%s\"登入驗證失敗"
 
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
 msgid "Authentication currently not possible"
 msgstr ""
 
@@ -4846,12 +4786,12 @@ msgstr ""
 msgid "macOS"
 msgstr ""
 
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
 #, python-format
 msgid "%s configuration error"
 msgstr "%s 設定錯誤"
 
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
 #, fuzzy, python-format
 msgid ""
 "Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4870,293 +4810,249 @@ msgstr ""
 "錯誤: \n"
 "%s"
 
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
 msgid "audio input"
 msgstr "音訊輸入"
 
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
 msgid "audio output"
 msgstr "音訊輸出"
 
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
 msgid "video input"
 msgstr "視訊輸入"
 
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "伺服器名稱必須在 1 到 1023 個字元之間"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "主機名稱中有無效的字元。"
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "伺服器的位址是必須的。"
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "使用者名稱必須在 1 到 1023 個字元之間"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "在使用者名稱中有無效的字元。"
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "資源必須在 1 到 1023 個字元之間"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "資源中含有無效字元。"
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
 msgid "Busy"
 msgstr "忙碌"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
 msgid "_Not Available"
 msgstr "離開很久了(_N)"
 
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
 msgid "Not Available"
 msgstr "離開很久了"
 
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
 msgid "?user status:_Available"
 msgstr "線上(_A)"
 
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
 msgid "?user status:Available"
 msgstr "線上"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
 msgid "Connecting"
 msgstr "正在連線"
 
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
 msgid "A_way"
 msgstr "離開(_A)"
 
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
 #: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
 msgid "Away"
 msgstr "離開"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
 msgid "_Offline"
 msgstr "離線(_O)"
 
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
 msgid "Offline"
 msgstr "離線"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
 msgid "?contact has status:Has errors"
 msgstr "有錯誤"
 
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
 msgid "?Subscription we already have:None"
 msgstr "無"
 
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
 #, fuzzy
 msgid "Unknown"
 msgstr "不明"
 
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
 msgid "?Ask (for Subscription):None"
 msgstr "無"
 
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
 msgid "Subscribe"
 msgstr "認證"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
 msgid "?Group Chat Contact Role:None"
 msgstr "無"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
 msgid "Moderators"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
 msgid "Moderator"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
 msgid "Participants"
 msgstr "參與者"
 
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
 msgid "Participant"
 msgstr "參與者"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
 msgid "Visitors"
 msgstr "訪客"
 
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
 msgid "Visitor"
 msgstr "訪客"
 
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "無"
 
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
 #, fuzzy
 msgid "Owners"
 msgstr "所有者"
 
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
 msgid "Owner"
 msgstr "所有者"
 
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
 #, fuzzy
 msgid "Administrators"
 msgstr "管理員"
 
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
 msgid "Administrator"
 msgstr "管理員"
 
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
 #, fuzzy
 msgid "Members"
 msgstr "成員"
 
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "成員"
 
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "注意著與您的對話"
 
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
 #, fuzzy
 msgid "is composing a message…"
 msgstr "正在輸入訊息…"
 
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "暫停輸入訊息"
 
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "關閉了聊天視窗或標籤"
 
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 條訊息未處理"
 
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
 #, fuzzy, python-format
 msgid "from group chat %s"
 msgstr "在多人聊天視窗中(_G)"
 
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " 來自使用者 %s"
 
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " 來自 %s"
 
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 個未處理事件"
 
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
 msgid "I would like to add you to my contact list."
 msgstr "我想加入您到我的聯絡人清單"
 
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
 msgid "Hello, I am $name."
 msgstr "您好，我是$name"
 
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
 msgid "Timeout loading image"
 msgstr "讀取檔案逾時"
 
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
 msgid "Image is too big"
 msgstr "圖片太大"
 
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "證書吊銷清單還未生效"
 
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
 #, fuzzy
 msgid "Error loading image"
 msgstr "讀取檔案逾時"
 
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 是一個檔案但它應該是一個目錄"
 
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
 msgid "Gajim will now exit"
 msgstr "Gajim 即將離開"
 
@@ -5256,83 +5152,83 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
 msgid "I would like to add you to my roster."
 msgstr "我想將您加入到我的聯絡人清單。"
 
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
 msgid "File is empty"
 msgstr "檔案為空"
 
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
 msgid "File does not exist"
 msgstr "檔案不存在"
 
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
 #, fuzzy
 msgid "Encrypting file…"
 msgstr "E2E 加密被停用"
 
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
 msgid "Requesting HTTP File Upload Slot…"
 msgstr ""
 
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
 msgid "Uploading via HTTP File Upload…"
 msgstr ""
 
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
 msgid "Change status information"
 msgstr "變更狀態資訊"
 
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
 msgid "Change status"
 msgstr "變更狀態"
 
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
 msgid "Set the presence type and description"
 msgstr "設定狀態類型與描述"
 
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
 msgid "Free for chat"
 msgstr "和我聊天吧"
 
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
 msgid "Online"
 msgstr "線上"
 
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
 msgid "Extended away"
 msgstr "離開很久了"
 
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
 msgid "Do not disturb"
 msgstr "請無打擾"
 
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
 msgid "Offline - disconnect"
 msgstr "離線 - 未連線"
 
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
 msgid "Presence description:"
 msgstr "狀態描述:"
 
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
 msgid "The status has been changed."
 msgstr "狀態發生了變化。"
 
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "已傳送聯絡人: \"%s\" (%s)"
 
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
 msgid "Sent contacts:"
 msgstr "已傳送聯絡人:"
 
@@ -5355,7 +5251,7 @@ msgid "Join Automatically"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
 msgid "Account"
 msgstr "帳號"
 
@@ -5366,7 +5262,7 @@ msgstr "多人聊天"
 
 #: gajim/data/gui/join_groupchat_window.ui:180
 #: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
 #, fuzzy
 msgid "Password"
 msgstr "密碼:"
@@ -5390,7 +5286,7 @@ msgstr "在多人聊天視窗中(_G)"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
 #, fuzzy
 msgid "Join"
 msgstr "加入(_J)"
@@ -5408,17 +5304,17 @@ msgid "Time remaining"
 msgstr ""
 
 #: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
 #: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -5567,7 +5463,7 @@ msgstr "聯絡人資訊"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:15
 #: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
 msgid "Description"
 msgstr "描述"
 
@@ -5772,40 +5668,45 @@ msgstr "工作"
 #. "About" is the text of a tab of vcard window
 #: gajim/data/gui/profile_window.ui:1297
 #: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
 msgid "About"
 msgstr "關於"
 
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
 #, fuzzy
 msgid "Global Group Chat Search"
 msgstr "加入多人聊天"
 
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
 #, fuzzy
 msgid "_Back"
 msgstr "馬上回來"
 
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
 #: gajim/gtk/groupchat_join.py:65
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
 #, fuzzy
 msgid "Select Account"
 msgstr "移除帳號 %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
 #, fuzzy
 msgid "_Select"
 msgstr "清潔"
 
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
 msgid ""
 "No contacts found\n"
 "You can also type an XMPP address"
@@ -5875,6 +5776,7 @@ msgid "Strike"
 msgstr "劃去"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
 msgid "Color"
 msgstr "Color"
 
@@ -5887,136 +5789,133 @@ msgstr "字型"
 msgid "Clear formatting"
 msgstr "清楚格式"
 
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
 #, fuzzy
 msgid "Choose encryption"
 msgstr "密碼加密"
 
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "顯示表情清單(Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
 #, fuzzy
 msgid "Joining…"
 msgstr "封禁…"
 
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
 #, fuzzy
 msgid "Enter new nickname"
 msgstr "為聯絡人 %s 輸入新的暱稱"
 
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
 #, fuzzy
 msgid "Ch_ange"
 msgstr "變更暱稱(_N)…"
 
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "變更主題(_S)…"
+
+#: gajim/data/gui/groupchat_control.ui:786
 #, fuzzy
 msgid "Enter password"
 msgstr "輸入新的密碼"
 
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
 #, fuzzy
 msgid "_Leave Group Chat"
 msgstr "離開聊天室"
 
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
 #, fuzzy
 msgid "Gajim will not try to join this group chat again"
 msgstr "如果選取，Gajim 會在啟動時加入此聊天室"
 
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
 #, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
 msgstr "<b>發生了一個錯誤:</b>"
 
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
 #, fuzzy
 msgid "_Try again"
 msgstr "重新驗證…"
 
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
 #, fuzzy
 msgid "Kick participant"
 msgstr "參與者"
 
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
 msgid "Insert Emoji"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
 #, fuzzy
 msgid "Reason (optional)"
 msgstr "您也可以輸入一個可選的替代地點:"
 
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
 #, fuzzy
 msgid "Ban participant"
 msgstr "參與者"
 
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
 #, fuzzy
 msgid "Destroy group chat"
 msgstr "新聊天室"
 
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
 #, fuzzy
 msgid "_Destroy"
 msgstr "正在銷毀 %s"
 
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
 #, fuzzy
 msgid "Alternate venue (optional)..."
 msgstr "您也可以輸入一個可選的替代地點:"
 
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
 #, fuzzy
 msgid "Reason (optional)..."
 msgstr "原因"
 
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
 msgid "Reason for destruction"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
 msgid "Where participants should go"
 msgstr ""
 
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
 #, fuzzy
 msgid "Enter a new name for this group chat"
 msgstr "為群組 %s 輸入新的名稱"
 
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
 #, fuzzy
 msgid "_Invite"
 msgstr "邀請(_V)"
 
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "事件類型"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "事件"
-
 #: gajim/data/gui/chat_control.ui:35
 #, fuzzy
 msgid "<b>1</b>"
@@ -6112,20 +6011,20 @@ msgid "Add"
 msgstr "加入"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
 #, fuzzy
 msgid "Remove"
 msgstr "移除(_R)"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
 #, fuzzy
 msgid "Resource"
 msgstr "資源:"
 
 #: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
 msgid "Status"
 msgstr "狀態"
 
@@ -6135,7 +6034,7 @@ msgid "Client"
 msgstr "<b>客戶端:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
 #, fuzzy
 msgid "System"
 msgstr "<b>系統:</b>"
@@ -6277,38 +6176,39 @@ msgstr "視窗行為(_W)"
 msgid "_Show contact list on startup"
 msgstr "啟動時顯示名冊(_S):"
 
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
 msgid "_Tabs placement"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
 msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
 msgid ""
 "If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
 msgid "Behavior of Windows and Tabs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "合併帳號(_G)"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
 #, fuzzy
 msgid "Show a_vatars of contacts in contact list"
 msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
 
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
 #, fuzzy
 msgid ""
 "If checked, avatars of contacts will be shown in the contact list window and "
@@ -6316,12 +6216,12 @@ msgid ""
 msgstr ""
 "如果選取，Gajim 會在聯絡人清單和多人聊天視窗中顯示聯絡人清單中的聯絡人細節"
 
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
 #, fuzzy
 msgid "Show status _messages of contacts in contact list"
 msgstr "在聯絡人清單中顯示聯絡人的狀態資訊(_M)"
 
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
@@ -6330,53 +6230,53 @@ msgstr ""
 "如果選取，Gajim 會在聯絡人清單和多人聊天視窗中聯絡人名稱下方顯示聯絡人狀態訊"
 "息"
 
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
 #, fuzzy
 msgid ""
 "Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "在聯絡人清單中顯示聯絡人的位置資訊(_L)"
 
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
 msgid ""
 "If checked, additional info published by the contact will be shown in the "
 "contact list. Additional infos (published via PEP) may include e.g. mood, "
 "activity, tune, location, ..."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
 msgid "Sort contacts by status"
 msgstr "將聯絡人按狀態排序"
 
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
 #, fuzzy
 msgid "in _contact list"
 msgstr "已傳送聯絡人:"
 
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
 msgid "in _group chats"
 msgstr "在多人聊天視窗中(_G)"
 
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
 #, fuzzy
 msgid "Contact List Appearance"
 msgstr "聯絡人清單項交換"
 
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
 msgid "Enable auto copy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
 msgid ""
 "If enabled, selecting Text will be copied to the clipboard, otherwise you "
 "can copy text with CTRL + SHIFT + C"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
 #, fuzzy
 msgid "Enable spell _checking"
 msgstr "拼寫檢查工具"
 
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
 #, fuzzy
 msgid ""
 "If checked, spelling errors in input fields of chat windows will be "
@@ -6388,29 +6288,29 @@ msgstr ""
 "過在編輯框點擊右鍵的方式明確設定語言，聯絡人或聊天室的預設語言將被\n"
 "使用。"
 
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
 #, fuzzy
 msgid "Show message recei_pts (✔)"
 msgstr "訊息內容"
 
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
 msgid ""
 "If checked, a small checkmark will be shown after each message when it was "
 "received. Note that this is not supported by all clients and therefore could "
 "be misleading."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
 #, fuzzy
 msgid "_Show XHTML formatting"
 msgstr "顯示格式清單(Alt+M)"
 
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
 #, fuzzy
 msgid "Display status messages in _single chats"
 msgstr "在聯絡人清單中顯示聯絡人的狀態資訊(_M)"
 
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
 #, fuzzy
 msgid ""
 "If checked, status lines will be shown in 1 on 1 chats when a contact "
@@ -6419,184 +6319,185 @@ msgstr ""
 "如果為假，Gajim 將不會在聯絡人的狀態或狀態訊息變化時在聊天視窗中顯示一列提"
 "示。"
 
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
 #, fuzzy
 msgid "Show subject after _joining a group chat"
 msgstr "無法加入聊天室"
 
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
 #, fuzzy
 msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "無法加入聊天室"
 
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
 #, fuzzy
 msgid "Group Chat Settings"
 msgstr "外掛程式"
 
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
 msgid "Show join/leave (Default)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
 "be overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
 msgid "Default Sync Threshold"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
 #, fuzzy
 msgid "Show status changes (Default)"
 msgstr "記錄聯絡人狀態變化(_L)"
 
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
 "overridden in the group chat menu."
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
 #, fuzzy
 msgid "Show chatstate in tabs"
 msgstr "在標籤上顯示關閉按鈕?"
 
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
 #, fuzzy
 msgid ""
 "If checked, the tab will be colored according to the current chatstate of "
 "the contact"
 msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
 #, fuzzy
 msgid "Show chatstate in contact list"
 msgstr "在標籤上顯示關閉按鈕?"
 
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
 msgid ""
 "If checked, the contact row will be colored according to the current "
 "chatstate of the contact"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
 msgid "Show chatstate in banner"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
 msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
 "banner"
-msgstr ""
+msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
 #, fuzzy
 msgid "Chatstate"
 msgstr "最後狀態"
 
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
 #: gajim/data/gui/history_window.ui:303
 #, fuzzy
 msgid "Chat"
 msgstr "聊天"
 
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
 #, fuzzy
 msgid "Show _notification area icon"
 msgstr "在通知區域顯示圖示:"
 
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
 #, fuzzy
 msgid "_When new event is received"
 msgstr "當收到新的事件:"
 
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
 #, fuzzy
 msgid "Show popups/notifications when a chat window is already _open"
 msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
 
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
 #, fuzzy
 msgid "Allow popups/notifications when I'm _away, not available or busy"
 msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
 
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
 msgid "Notify me about contacts that sign _in"
 msgstr "提醒我聯絡人登入(_I)"
 
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
 msgid ""
 "A popup window about contacts that just signed in will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
 msgid "Notify me about contacts that sign _out"
 msgstr "提醒我聯絡人登出(_O)"
 
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
 msgid ""
 "A popup window about contacts that just signed out will be shown in the "
 "bottom right of the screen "
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
 #, fuzzy
 msgid "Visual Notifications"
 msgstr "<b>可視化提示</b>"
 
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
 msgid "Play _sounds"
 msgstr "播放聲音(_S)"
 
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
 msgid "Ma_nage..."
 msgstr "管理(_N)…"
 
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
 #, fuzzy
 msgid "Allow playing sounds when I'm _busy"
 msgstr "在我忙碌時允許播放聲音(_B)"
 
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
 #, fuzzy
 msgid "Sounds"
 msgstr "Wav聲音"
 
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
 msgid "Notifications"
 msgstr "通知"
 
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
 #, fuzzy
 msgid "No_t Available"
 msgstr "離開很久了"
 
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Not Available when the computer "
 "has not been used for the specified time"
 msgstr "如果選取，Gajim 會在電腦閒置更長時間後將您的狀態設定為離開很久了。"
 
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
 #, fuzzy
 msgid ""
 "If checked, the status will be changed to Away when the computer has not "
 "been used for the specified time"
 msgstr "如果選取，Gajim 會在電腦閒置更長時間後將您的狀態設定為離開很久了。"
 
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
 #, fuzzy
 msgid ""
 "The automatic away status message. If empty, the current status message will "
@@ -6608,7 +6509,7 @@ msgstr ""
 "$S會被上個狀態訊息替換\n"
 "$T會被自動離開的逾時時間替換"
 
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
 #, fuzzy
 msgid ""
 "The automatic not available status message. If empty, the current status "
@@ -6620,107 +6521,107 @@ msgstr ""
 "$S會被上個狀態訊息替換\n"
 "$T會被自動無法使用的逾時時間替換"
 
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
 #, fuzzy
 msgid "Minutes"
 msgstr "分鐘"
 
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
 #, fuzzy
 msgid "Automatic Status"
 msgstr "自動調整狀態"
 
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
 msgid "_Remember and restore status of the last session"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
 msgid ""
 "If checked, the status and status message used in the last session will be "
 "restored"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
 #, fuzzy
 msgid "Ask for status message when I"
 msgstr "詢問狀態訊息，當我:"
 
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
 msgid "Sign _in"
 msgstr "登入(I)"
 
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
 msgid "Sign _out"
 msgstr "離開登入(_O)"
 
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
 
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
 msgid "Default Message"
 msgstr "預設訊息"
 
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
 msgid "Enabled"
 msgstr "啟用"
 
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
 #, fuzzy
 msgid "Status Messages"
 msgstr "狀態訊息"
 
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
 #, fuzzy
 msgid "Preset Status Messages"
 msgstr "<b>預設狀態訊息</b>"
 
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
 #, fuzzy
 msgid "Themes"
 msgstr "主題"
 
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
 #, fuzzy
 msgid "_Theme"
 msgstr "主題"
 
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
 msgid "Configure color and font of the interface"
 msgstr "配置介面顏色與字型"
 
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
 #, fuzzy
 msgid "_Dark Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
 msgid "Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
 #, fuzzy
 msgid "_Emoji Theme"
 msgstr "Gajim - %s"
 
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
 msgid "Icons"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
 #, fuzzy
 msgid "_Status iconset"
 msgstr "狀態圖示集(_I):"
 
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
 #, fuzzy
 msgid "Use transports _icons"
 msgstr "使用代理的圖示設定(_T)"
 
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
 #, fuzzy
 msgid ""
 "If checked, protocol-specific status icons will be used (e.g. a contact from "
@@ -6729,125 +6630,135 @@ msgstr ""
 "如果選取，Gajim 會以協定特定的方式顯示狀態圖示。(例如，MSN 聯絡人會以同\n"
 "MSN 相同的圖示顯示線上，離開，忙，等等狀態…)"
 
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
 msgid "_Convert ASCII Emojis"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
 msgid "Style"
 msgstr "風格"
 
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
 #, fuzzy
 msgid "Show _Features"
 msgstr "特性"
 
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
 #, fuzzy
 msgid "A_udio output device"
 msgstr "音訊輸出裝置"
 
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
 #, fuzzy
 msgid "_Audio input device"
 msgstr "音訊輸入裝置"
 
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
 #, fuzzy
 msgid "Audio"
 msgstr "音訊測試"
 
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
 #, fuzzy
 msgid "Video"
 msgstr "視訊測試"
 
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
 #, fuzzy
 msgid "_Video input device"
 msgstr "視訊輸入裝置"
 
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
 #, fuzzy
 msgid "Video output"
 msgstr "視訊輸出"
 
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
 #, fuzzy
 msgid "Video _framerate"
 msgstr "視訊圖框速率"
 
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
 #, fuzzy
 msgid "Video si_ze"
 msgstr "視訊尺寸"
 
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
 msgid "Connection"
 msgstr "連線"
 
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
 #, fuzzy
 msgid "STU_N server"
 msgstr "STUN 伺服器:"
 
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
 #, fuzzy
 msgid ""
 "STUN server hostname. If no hostname was given, Gajim will try\n"
 "to discover one from the server. (Example: stun.iptel.org)"
 msgstr "STUN 伺服器的主機名稱。如果沒有給出，Gajim 會嘗試從伺服器上發現一個。"
 
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
 #, fuzzy
 msgid "Audio/Video"
 msgstr "音訊/視訊"
 
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
 msgid "_Global proxy"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
 msgid "_Manage..."
 msgstr "管理…"
 
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
 #, fuzzy
 msgid "_Store status changes of contacts in history"
 msgstr "記錄聯絡人狀態變化(_L)"
 
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
 msgid "Enable _debug logging (restart required)"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
 #, fuzzy
 msgid "If checked, Gajim will store a log file for debugging"
 msgstr "如果選取，Gajim 會記錄本帳號的密碼"
 
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
 msgid "Opens folder containing debug logs"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>雜項</b>"
 
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
 msgid "Attention: Please use these options with caution!"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
 msgid "_Open..."
 msgstr "開啟(_O)…"
 
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
 #, fuzzy
 msgid "Advanced Configuration Editor (ACE)"
 msgstr "進階設定編輯器"
@@ -7030,12 +6941,12 @@ msgstr ""
 msgid "Your password"
 msgstr "輸入新的密碼"
 
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
 #, fuzzy
 msgid "_Advanced Settings"
 msgstr "外掛程式"
 
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
 #, fuzzy
 msgid "Proxy, custom hostname and port"
 msgstr "使用自訂的主機名稱/連接埠"
@@ -7121,7 +7032,7 @@ msgid ""
 "a>"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
 #, fuzzy
 msgid "Sign Up"
 msgstr "登入(I)"
@@ -7135,7 +7046,7 @@ msgstr "請用您想要的名稱新增一個主題。"
 msgid "Sign up Anonymously"
 msgstr ""
 
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
 msgid "Note: Anonymous accounts are not possible on all servers"
 msgstr ""
 
@@ -7163,8 +7074,8 @@ msgstr "恢復為預設顏色設定(_R)"
 msgid "Resets value to default"
 msgstr "恢復為預設顏色設定(_R)"
 
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
 #, fuzzy
 msgid "Hostname"
 msgstr "主機名稱(_H):"
@@ -7207,7 +7118,7 @@ msgstr "檢視憑證…"
 msgid "Proxy Host"
 msgstr "代理伺服器位址(_H):"
 
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
 msgid "Type"
 msgstr "類型"
 
@@ -7221,8 +7132,7 @@ msgstr "協定(_P):"
 msgid "Copy info to clipboard"
 msgstr "複製連結位置(_C)"
 
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
 msgid "Features"
 msgstr "特性"
 
@@ -7407,6 +7317,11 @@ msgstr ""
 msgid "Change Status Message…"
 msgstr "變更狀態訊息(_C)"
 
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>心情:</b>"
@@ -7483,9 +7398,10 @@ msgid "Installed"
 msgstr "已安裝"
 
 #: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
 msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
 msgstr "外掛程式的描述會被顯示在這裡。這些文字在外掛程式視窗初始化時將被去除"
 
 #: gajim/data/gui/privacy_list_window.ui:18
@@ -7671,79 +7587,106 @@ msgstr "外掛程式"
 msgid "_Name"
 msgstr "名稱(_N):"
 
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
 #, fuzzy
 msgid "Proxy"
 msgstr "代理伺服器(_Y):"
 
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "開始聊天"
+
 #: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
 msgstr "離開聊天室"
 
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "命令歷程記錄管理器"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
 msgstr "外掛程式"
 
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
 msgstr "參數"
 
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "帳號"
 
 #: gajim/data/gui/application_menu.ui:39
 #, fuzzy
-msgid "View"
+msgid "_View"
 msgstr "檢視(_V)"
 
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
 #, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
 msgstr "只顯示活動的聯絡人(_A)"
 
 #: gajim/data/gui/application_menu.ui:46
 #, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
 msgstr "顯示離線聯絡人"
 
 #: gajim/data/gui/application_menu.ui:50
 #, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
 msgstr "只顯示活動的聯絡人(_A)"
 
 #: gajim/data/gui/application_menu.ui:54
 #, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
 msgstr "顯示代理(_P)"
 
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
 msgstr " XML 主控臺"
 
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "檔案傳輸"
+
 #: gajim/data/gui/application_menu.ui:74
 #, fuzzy
-msgid "Help"
+msgid "_Help"
 msgstr "求助(_H)"
 
 #: gajim/data/gui/application_menu.ui:77
 #, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
 msgstr "線上"
 
 #: gajim/data/gui/application_menu.ui:81
 #, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
 msgstr "線上"
 
 #: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
 msgstr ""
 
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "特性"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "關於"
+
 #: gajim/data/gui/groupchat_creation.ui:27
 msgid "Public or Private?"
 msgstr ""
@@ -7758,6 +7701,11 @@ msgstr ""
 msgid "<b>Public:</b> Anyone who knows the address can join."
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "離開聊天室"
+
 #: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
 msgid "_Description"
@@ -8043,60 +7991,68 @@ msgstr "聯絡人清單項交換"
 msgid "Create new group chat"
 msgstr "離開聊天室"
 
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "參數"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "外掛程式"
+
+#: gajim/data/gui/shortcuts_window.ui:217
 #, fuzzy
 msgid "File transfers"
 msgstr "檔案傳輸"
 
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Set the status message"
 msgstr "狀態訊息"
 
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
 #, fuzzy
 msgid "Show XML console"
 msgstr "顯示 XML 主控臺(_X)"
 
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
 #, fuzzy
 msgid "Appearance"
 msgstr "<b>聊天視窗外觀</b>"
 
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
 #, fuzzy
 msgid "Show offline contacts"
 msgstr "顯示離線聯絡人"
 
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
 #, fuzzy
 msgid "Show only active contacts"
 msgstr "只顯示活動的聯絡人(_A)"
 
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
 msgid "Enable contact list filtering"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
 #, fuzzy
 msgid "Show / hide contact list"
 msgstr "只顯示活動的聯絡人(_A)"
 
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
 #, fuzzy
 msgid "Contact information"
 msgstr "聯絡人資訊"
 
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
 #, fuzzy
 msgid "Rename contact"
 msgstr "重新命名聯絡人"
 
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
 #, fuzzy
 msgid "Delete contact"
 msgstr "已傳送聯絡人:"
@@ -8172,12 +8128,16 @@ msgstr "請填寫表格。"
 msgid "Group Chat Configuration"
 msgstr "多人聊天邀請"
 
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr " XML 主控臺"
+
 #: gajim/data/gui/xml_console.ui:131
 #, fuzzy
 msgid "Start Search..."
 msgstr "開始聊天(_S)…"
 
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
 #, fuzzy
 msgid "Filter"
 msgstr "過濾器:"
@@ -8223,11 +8183,6 @@ msgstr "顯示所有未處理事件(_E)"
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "參數"
-
 #: gajim/data/gui/single_message_window.ui:42
 #, fuzzy
 msgid "_To"
@@ -8543,124 +8498,124 @@ msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
 #, fuzzy
 msgid "?Group chat feature:Open"
 msgstr "無"
 
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
 #, fuzzy
 msgid "Anyone can join this group chat"
 msgstr "%s 加入聊天室"
 
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
 #, fuzzy
 msgid "?Group chat feature:Members Only"
 msgstr "多人聊天訊息高亮度顯示"
 
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
 msgid "This group chat is restricted to members only"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
 #, fuzzy
 msgid "?Group chat feature:Not Anonymous"
 msgstr "多人聊天"
 
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
 msgid "All other group chat participants can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
 #, fuzzy
 msgid "?Group chat feature:Semi-Anonymous"
 msgstr "多人聊天訊息高亮度顯示"
 
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
 msgid "Only moderators can see your XMPP address"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
 #, fuzzy
 msgid "?Group chat feature:Moderated"
 msgstr "無"
 
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
 msgid ""
 "Participants entering this group chat need to request permission to send "
 "messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
 #, fuzzy
 msgid "?Group chat feature:Not Moderated"
 msgstr "多人聊天"
 
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
 msgid "Participants entering this group chat are allowed to send messages"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
 #, fuzzy
 msgid "?Group chat feature:Public"
 msgstr "多人聊天訊息高亮度顯示"
 
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
 msgid "Group chat can be found via search"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
 #, fuzzy
 msgid "?Group chat feature:Hidden"
 msgstr "無"
 
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
 #, fuzzy
 msgid "This group chat can not be found via search"
 msgstr "找不到該服務"
 
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
 #, fuzzy
 msgid "?Group chat feature:Password Required"
 msgstr "多人聊天"
 
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
 msgid "This group chat does require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
 #, fuzzy
 msgid "?Group chat feature:No Password Required"
 msgstr "多人聊天"
 
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
 msgid "This group chat does not require a password upon entry"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
 #, fuzzy
 msgid "?Group chat feature:Persistent"
 msgstr "多人聊天"
 
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
 msgid "This group chat persists even if there are no participants"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
 #, fuzzy
 msgid "?Group chat feature:Temporary"
 msgstr "無"
 
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
 msgid "This group chat will be destroyed once the last participant left"
 msgstr ""
 
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
 #, fuzzy
 msgid "?Group chat feature:Archiving"
 msgstr "多人聊天邀請"
 
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
 #, fuzzy
 msgid "Messages are archived on the server"
 msgstr "本次作業階段將在伺服器上被存檔"
@@ -8689,7 +8644,7 @@ msgid "Sender: %s"
 msgstr "傳送者:  %s"
 
 #: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
 msgid "Recipient: "
 msgstr "接收者: "
 
@@ -8841,7 +8796,7 @@ msgstr "檔案: "
 msgid "It is not possible to send empty files"
 msgstr "無法傳送空檔案"
 
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
 msgid "Sender: "
 msgstr "傳送者: "
 
@@ -8856,7 +8811,7 @@ msgid "Change"
 msgstr "變更暱稱(_N)…"
 
 #: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
 #, fuzzy
 msgid "Back"
 msgstr "馬上回來"
@@ -8887,11 +8842,12 @@ msgid "Password Change Failed"
 msgstr "需要密碼"
 
 #: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "建立帳號期間發生錯誤"
 
 #: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
 msgid "Change Password"
 msgstr "變更密碼"
 
@@ -8929,40 +8885,35 @@ msgstr ""
 msgid "Unknown SSL error '%s'"
 msgstr "不明的 SSL 錯誤: %d"
 
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
 #, fuzzy
-msgid "Start New Conversation"
-msgstr "繼續對話"
+msgid "Start / Join Chat"
+msgstr "開始聊天"
 
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必須連線才能加入聊天室。"
 
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
 msgid "Join Group Chat"
 msgstr "加入多人聊天"
 
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "加入聯絡人(_A)…"
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
 msgid ""
 "Search for group chats globally\n"
 "(press Return to start search)"
 msgstr ""
 
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
 #, fuzzy, python-format
 msgid "%s group chats found"
 msgstr " %s 找不到"
 
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
 msgid "This service has not yet responded with detailed information"
 msgstr "服務還沒有詳細的資訊應答"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8971,174 +8922,174 @@ msgstr ""
 "這個服務無法應答詳細的資訊。\n"
 "這很可能是伺服器的遺留問題，或是伺服器被損壞了"
 
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
 msgid "Others"
 msgstr "其他"
 
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
 #, fuzzy
 msgid "Group Chat"
 msgstr "多人聊天"
 
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
 msgid "Without a connection, you can not browse available services"
 msgstr "連線後才可瀏覽可用服務"
 
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帳號 %s 來發掘服務"
 
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
 msgid "Service Discovery"
 msgstr "搜尋服務"
 
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
 msgid "The service could not be found"
 msgstr "找不到該服務"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr "此位址沒有服務或無應答。請檢查位址後重試。"
 
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
 msgid "The service is not browsable"
 msgstr "該服務無法瀏覽"
 
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
 msgid "This type of service does not contain any items to browse."
 msgstr "此服務沒有項目可瀏覽。"
 
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
 msgid "Invalid Server Name"
 msgstr "無效的伺服器名稱"
 
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用帳號 %(account)s 瀏覽位址 %(address)s"
 
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
 #, fuzzy
 msgid "Browse"
 msgstr "瀏覽(_B)"
 
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
 msgid "This service does not contain any items to browse."
 msgstr "此服務不包含任何項目可瀏覽。"
 
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
 #, fuzzy
 msgid "_Command"
 msgstr "命令"
 
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
 msgid "Re_gister"
 msgstr "註冊(_G)"
 
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "已掃描 %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
 msgid "Users"
 msgstr "使用者"
 
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
 msgid "Subscribed"
 msgstr "訂閱"
 
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
 msgid "Node"
 msgstr "節點"
 
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
 #, fuzzy
 msgid "_New post"
 msgstr "新發表"
 
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
 msgid "_Unsubscribe"
 msgstr "退訂(_S)"
 
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
 msgid "Send Single Message"
 msgstr "傳送單條訊息(_S)"
 
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
 #, fuzzy
 msgid "(No subject)"
 msgstr "主題"
 
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
 #, python-format
 msgid "Single Message using account %s"
 msgstr "單條訊息，使用帳號 %s"
 
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
 #, python-format
 msgid "Single Message in account %s"
 msgstr "單條訊息，在帳號 %s"
 
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
 msgid "Single Message"
 msgstr "單條訊息"
 
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
 #, python-format
 msgid "Send %s"
 msgstr "傳送 %s"
 
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
 #, fuzzy, python-format
 msgid "Characters typed: %s"
 msgstr "不允許的字元"
 
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
 msgid "Connection not available"
 msgstr "連線無法使用"
 
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "請確認您已經連線到 \"%s\"。"
 
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
 #, fuzzy, python-format
 msgid ""
 "It is not possible to send a message to %s, this XMPP Address is not valid."
 msgstr "不能向 %s 傳送訊息，無效的 JID。"
 
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
 #, python-format
 msgid "RE: %s"
 msgstr "回復: %s"
 
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 寫道: \n"
@@ -9184,93 +9135,76 @@ msgstr "註冊成功"
 msgid "Registration failed"
 msgstr "註冊失敗"
 
-#: gajim/gtk/dialogs.py:148
-#, fuzzy, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "語言 %s 的詞典無法使用"
-
-#: gajim/gtk/dialogs.py:149
-#, fuzzy, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"您必須安裝 %s 詞典才能使用拼寫檢查，或是在拼寫檢查語言選項中設定另一種語"
-"言。\n"
-"高亮度拼寫錯誤的特性不會被啟用。"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
 #, fuzzy
 msgid "Certificate"
 msgstr "客戶端證書"
 
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
 #, fuzzy, python-format
 msgid ""
 "Certificate for \n"
 "%s"
 msgstr "帳號憑證 %s"
 
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG 號碼:"
 
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
 #, fuzzy
 msgid "Expires on: "
 msgstr "expire"
 
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "多人聊天邀請"
 
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact 邀請您參加聊天室 %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
 #, python-format
 msgid "Comment: %s"
 msgstr "註釋: %s"
@@ -9285,6 +9219,11 @@ msgstr "GG 號碼:"
 msgid "ICQ Number"
 msgstr "ICQ 號碼:"
 
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "加入聯絡人(_A)…"
+
 #: gajim/gtk/add_contact.py:260
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9340,7 +9279,7 @@ msgstr "加入服務錯誤。 %s"
 #: gajim/gtk/add_contact.py:486
 #, python-format
 msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
@@ -9502,43 +9441,63 @@ msgstr "聯絡人已中斷連線"
 msgid "Contact Connected Background "
 msgstr "已連線的聯絡人"
 
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "狀態訊息"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "狀態訊息"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "狀態訊息"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "狀態訊息"
+
+#: gajim/gtk/themes.py:187
 #, fuzzy
 msgid "Gajim Themes"
 msgstr "Gajim - %s"
 
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
 #, fuzzy
 msgid "Invalid Name"
 msgstr "不合法的暱稱"
 
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
 msgid "Name <b>default</b> is not allowed"
 msgstr ""
 
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
 #, fuzzy
 msgid "Spaces are not allowed"
 msgstr "不允許的字元"
 
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
 #, fuzzy
 msgid "Do you want to delete this theme?"
 msgstr "您確定要刪除所選取的訊息?"
 
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
 #, fuzzy
 msgid ""
 "This is the theme you are currently using.\n"
 "Do you want to delete this theme?"
 msgstr "這個名稱已被使用。您想要覆寫這個狀態訊息嗎?"
 
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
 #, fuzzy
 msgid "Delete Theme"
 msgstr "活動"
 
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
 #, fuzzy
 msgid "Remove Setting"
 msgstr "外掛程式"
@@ -9562,10 +9521,9 @@ msgid "Error: %s"
 msgstr "錯誤: %s"
 
 #: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
 msgid "Error"
 msgstr "錯誤"
 
@@ -9579,48 +9537,48 @@ msgstr "現在狀態: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "現在狀態:  %(status)s "
 
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
 #, fuzzy
 msgid "Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
 msgid "New E-mail"
 msgstr "新電子郵件"
 
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
 #: gajim/gtk/sounds.py:35
 msgid "All files"
 msgstr "所有檔案"
 
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
 #, fuzzy
 msgid "Clear File"
 msgstr "清潔"
 
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "管理代理伺服器設定"
 
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
 #, fuzzy
 msgid "No Proxy"
 msgstr "代理伺服器(_Y):"
 
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
 #, fuzzy
 msgid "Adjust to Status"
 msgstr "依據狀態調整(_A)"
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 msgid "On"
 msgstr ""
 
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
 #, fuzzy
 msgid "Off"
 msgstr "離線"
@@ -9641,7 +9599,7 @@ msgstr "帳號"
 
 #: gajim/gtk/remove_account.py:57
 #, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
 msgstr "註冊新帳號成功"
 
 #: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9673,60 +9631,65 @@ msgstr ""
 msgid "Account has to be connected"
 msgstr "帳號 \"%s\" 已連線到伺服器"
 
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "同步"
+
+#: gajim/gtk/history_sync.py:203
 #, fuzzy
 msgid "How far back should the chat history be synchronised?"
 msgstr "想做什麼?"
 
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
 msgid "One Month"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
 msgid "Three Months"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
 msgid "One Year"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
 msgid "Everything"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
 #, fuzzy
 msgid "Connecting..."
 msgstr "正在連線"
 
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
 #, fuzzy, python-format
 msgid "Downloaded %s messages"
 msgstr "轉發未讀訊息"
 
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
 #, python-format
 msgid ""
 "Finished synchronising chat history:\n"
 "%s messages downloaded"
 msgstr ""
 
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
 msgid "Gajim is fully synchronised with the archive."
 msgstr ""
 
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
 msgid "There is already a synchronisation in progress. Please try again later."
 msgstr ""
 
 #: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
 #, fuzzy
 msgid "A GTK XMPP client"
 msgstr "一個 GTK+ 的 Jabber 客戶端"
@@ -9788,126 +9751,126 @@ msgstr ""
 "Guanhao Yin <yinguanhao@gmail.com>\n"
 "趙惟倫 <chaoweilun@gmail.com>"
 
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "選擇要傳送的檔案…"
 
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
 #, fuzzy
 msgid "Choose Avatar…"
 msgstr "選擇歸檔檔案"
 
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
 #, fuzzy
 msgid "PNG files"
 msgstr "所有檔案"
 
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
 #, fuzzy
 msgid "JPEG files"
 msgstr "所有檔案"
 
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
 #, fuzzy
 msgid "SVG files"
 msgstr "傳送檔案(_F)"
 
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
 msgid "Images"
 msgstr "圖像"
 
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
 msgid "Choose Archive"
 msgstr "選擇歸檔檔案"
 
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
 #, fuzzy
 msgid "ZIP files"
 msgstr "Zip 檔案"
 
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
 #, fuzzy
 msgid "Save File as…"
 msgstr "另存為…"
 
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
 #, fuzzy
 msgid "_Open"
 msgstr "OpenPGP: "
 
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此聊天室的 %(owner_or_admin_or_member)s"
 
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
 msgid "Connected"
 msgstr "已連線"
 
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
 msgid "Disconnected"
 msgstr "已中斷連線"
 
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
 #, fuzzy
 msgid "File Name: "
 msgstr "檔案名稱:  %s"
 
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
 #, fuzzy
 msgid "?Noun:Download"
 msgstr "下載"
 
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
 #, fuzzy
 msgid "?Noun:Upload"
 msgstr "上傳"
 
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
 #, fuzzy
 msgid "?transfer type:Type: "
 msgstr "檔案傳輸已停止"
 
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
 #, fuzzy
 msgid "?transfer status:Transferred: "
 msgstr "?transfer status:暫停"
 
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
 #, fuzzy
 msgid "?transfer status:Status: "
 msgstr "?transfer status:暫停"
 
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
 msgid "Description: "
 msgstr "描述: "
 
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
 #, fuzzy
 msgid "?transfer status:Aborted"
 msgstr "?transfer status:暫停"
 
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
 #, fuzzy
 msgid "?transfer status:Completed"
 msgstr "?transfer status:暫停"
 
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暫停"
 
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
 #, fuzzy
 msgid "?transfer status:Stalled"
 msgstr "?transfer status:暫停"
 
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
 #, fuzzy
 msgid "?transfer status:Transferring"
 msgstr "?transfer status:暫停"
 
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
 #, fuzzy
 msgid "?transfer status:Not started"
 msgstr "?transfer status:暫停"
@@ -9916,7 +9879,7 @@ msgstr "?transfer status:暫停"
 msgid " (optional)..."
 msgstr ""
 
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
 #, fuzzy
 msgid "Invalid Address"
 msgstr "無效檔案"
@@ -9972,25 +9935,25 @@ msgstr "多人聊天訊息高亮度顯示"
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天訊息"
 
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
 #, fuzzy
 msgid "Required"
 msgstr "require"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "Yes"
 msgstr "Yes"
 
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "取消(_C)"
 
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
 msgid "Submit"
 msgstr ""
 
@@ -10009,11 +9972,6 @@ msgstr "使用帳號 %s"
 msgid "Hide _Contact List"
 msgstr "邀請聯絡人(_C)"
 
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "只顯示活動的聯絡人(_A)"
-
 #: gajim/gtk/statusicon.py:278
 msgid "Hide this menu"
 msgstr "隱藏本選單"
@@ -10059,36 +10017,31 @@ msgid ""
 "later."
 msgstr "發布您的個人資訊時發生錯誤，請稍後重試。"
 
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存檔偏好設定"
 
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
 #, fuzzy
 msgid "Archiving Preferences Saved"
 msgstr "編輯存檔偏好設定(_V)"
 
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
 #, fuzzy
 msgid "Your archiving preferences have successfully been saved."
 msgstr "%s 的存檔偏好設定"
 
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
 #, fuzzy
-msgid "No response from the Server"
-msgstr "尚未連線到伺服器"
+msgid "Archiving Preferences Error"
+msgstr "編輯存檔偏好設定(_V)"
 
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
 #, fuzzy
 msgid "Error received: {}"
 msgstr "在收到的資料表中有錯誤"
 
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "編輯存檔偏好設定(_V)"
-
 #: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "啟用的"
@@ -10137,183 +10090,183 @@ msgstr "無"
 msgid "?password:Hidden"
 msgstr "密碼:"
 
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
 msgid "Support"
 msgstr ""
 
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
 msgid "Security"
 msgstr ""
 
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
 msgid "Feedback"
 msgstr ""
 
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
 msgid "Abuse"
 msgstr ""
 
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
 msgid "Sales"
 msgstr ""
 
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
 #, fuzzy
 msgid ""
 "\n"
 "Disabled in preferences"
 msgstr "編輯存檔偏好設定(_V)"
 
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
 msgid "Audio / Video"
 msgstr "音訊/視訊"
 
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
 #, fuzzy
 msgid "Enables Gajim to provide Audio and Video chats"
 msgstr "開始進行語音視訊通話的能力。"
 
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
 msgid ""
 "Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
 "gstreamer1.0-plugins-ugly"
 msgstr ""
 
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
 #, fuzzy
 msgid "Feature not available under Windows"
 msgstr "特性在 Windows 下無法使用。"
 
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
 #, fuzzy
 msgid ""
 "Enables Gajim to measure your computer's idle time in order to set your "
 "Status automatically"
 msgstr "測算閒置時間以自動調整狀態的能力。"
 
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
 #, fuzzy
 msgid "Requires: libxss"
 msgstr "需要 libxss 函式庫。"
 
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
 msgid "No additional requirements"
 msgstr ""
 
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
 #, fuzzy
 msgid "Bonjour / Zeroconf (Serverless Chat)"
 msgstr "Bonjour / Zeroconf"
 
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
 #, fuzzy
 msgid ""
 "Enables Gajim to automatically detected clients in a local network for "
 "serverless chats"
 msgstr "無需伺服器自動偵測本地網路中其他客戶端進行聊天"
 
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
 #, fuzzy
 msgid "Requires: gir1.2-avahi-0.6"
 msgstr "需要 python-gupnp-igd。"
 
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
 #, fuzzy, python-format
 msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
 msgstr "需要 python-dbus。"
 
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
 #, fuzzy
 msgid "Location detection"
 msgstr "連線"
 
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
 msgid ""
 "Enables Gajim to be location-aware, if the user decides to publish the "
 "device’s location"
 msgstr ""
 
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
 #, fuzzy
 msgid "Requires: geoclue"
 msgstr "需要 libgtkspell。"
 
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
 #, fuzzy
 msgid "Feature is not available under Windows"
 msgstr "特性在 Windows 下無法使用。"
 
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
 #, fuzzy
 msgid "Notification Sounds"
 msgstr "通知"
 
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
 #, fuzzy
 msgid "Enables Gajim to play sounds for various notifications"
 msgstr "開始進行語音視訊通話的能力。"
 
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
 #, fuzzy
 msgid "Requires: gsound"
 msgstr "需要 python-dbus。"
 
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
 #, fuzzy
 msgid "Secure Password Storage"
 msgstr "儲存密碼"
 
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
 #, fuzzy
 msgid ""
 "Enables Gajim to store Passwords securely instead of storing them in "
 "plaintext"
 msgstr "密碼可以被安全地儲存，而不只是以純文字方式。"
 
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "需要 gnome-keyring 和 python-gnome2-desktop，或 kwalletcli。"
 
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
 msgid "Windows Credential Vault is used for secure password storage"
 msgstr ""
 
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
 msgid "Spell Checker"
 msgstr "拼寫檢查工具"
 
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
 msgid "Enables Gajim to spell check your messages while composing"
 msgstr ""
 
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
 #, fuzzy
 msgid "Requires: Gspell"
 msgstr "需要 libgtkspell。"
 
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
 msgid "UPnP-IGD Port Forwarding"
 msgstr ""
 
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
 #, fuzzy
 msgid ""
 "Enables Gajim to request your router to forward ports for file transfers"
 msgstr "要求您的路由器於檔案傳送時轉用通訊埠的能力。"
 
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
 #, fuzzy
 msgid "Requires: gir1.2-gupnpigd-1.0"
 msgstr "需要 python-gupnp-igd。"
 
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
 #, fuzzy
 msgid "Disabled in Preferences"
 msgstr "編輯存檔偏好設定(_V)"
@@ -10359,7 +10312,7 @@ msgstr "不合法的清單名稱"
 msgid "You must enter a name to create a privacy list."
 msgstr "您必須輸入一個名稱以建立一個隱私策略清單。"
 
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
 #, fuzzy
 msgid "Invite New Contact"
 msgstr "邀請聯絡人(_C)"
@@ -10387,7 +10340,7 @@ msgstr "完成(_F)"
 msgid "Commands"
 msgstr "命令"
 
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
 msgid "Next"
 msgstr ""
 
@@ -10459,119 +10412,133 @@ msgstr "%s 的認證請求"
 msgid "Loading"
 msgstr "載入"
 
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
 #, fuzzy
 msgid "Connect"
 msgstr "已連線"
 
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
 msgid "Log In"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
 msgid "An error occurred during account creation"
 msgstr "建立帳號期間發生錯誤"
 
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
 #, fuzzy
 msgid "Creating Account..."
 msgstr "移除帳號 %s"
 
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
 #, fuzzy
 msgid "Trying to create account..."
 msgstr "點擊以變更該帳號的密碼"
 
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "正在連線"
 
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "您的伺服器不支援 Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
 #, fuzzy
 msgid "Signup not allowed"
 msgstr "不允許的字元"
 
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
 #, fuzzy
 msgid "This server does not allow signup."
 msgstr "您的伺服器不支援 Vcard"
 
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
 #, fuzzy
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
 msgid ""
 "Gajim was not able to reach the server. Make sure your XMPP address is "
 "correct."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
 #, fuzzy
 msgid "Account is being created"
 msgstr "帳號 \"%s\" 已連線到伺服器"
 
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
 #, fuzzy
 msgid "Add Account"
 msgstr "加入聯絡人(_A)…"
 
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
 #, fuzzy
 msgid "Create New Account"
 msgstr "建立新訊息"
 
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
 #, fuzzy
 msgid "Must be a port number"
 msgstr "自訂連接埠必須為連接埠號碼。"
 
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
 #, fuzzy
 msgid "Port must be a number between 0 and 65535"
 msgstr "資源必須在 1 到 1023 個字元之間"
 
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
 #, fuzzy
 msgid "Advanced settings"
 msgstr "外掛程式"
 
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
 #, fuzzy
 msgid "Security Warning"
 msgstr "將封禁 %s"
 
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
 #, fuzzy, python-format
 msgid "Unknown TLS error '%s'"
 msgstr "不明的 SSL 錯誤: %d"
 
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
 #, fuzzy
 msgid "Create Account"
 msgstr "移除帳號 %s"
 
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
 msgid "Redirect"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
 #, fuzzy
 msgid "Register on the Website"
 msgstr "註冊到 %s"
 
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
 #, fuzzy
 msgid "Account Added"
 msgstr "帳號"
 
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
 msgid "Account has been added successfully"
 msgstr "帳號已成功加入"
 
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
 #, fuzzy
 msgid "All Accounts"
 msgstr "帳號"
@@ -10614,249 +10581,253 @@ msgstr "搜尋"
 msgid "No results found"
 msgstr "無結果"
 
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
 msgid "Missing dependencies for Audio/Video"
 msgstr ""
 
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
 msgid "Default"
 msgstr "預設"
 
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
 msgid ""
 "<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
 "will be disabled"
 msgstr ""
 
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
 msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
 msgstr ""
 
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
 msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
 msgstr ""
 
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
 msgid "status message title"
 msgstr "狀態訊息標題"
 
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
 msgid "status message text"
 msgstr "狀態訊息文字"
 
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
 #, fuzzy
 msgid "Re-Login"
 msgstr "現在重新登入?"
 
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
 #, fuzzy
 msgid "Re-Login now?"
 msgstr "現在重新登入?"
 
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
 #, fuzzy
 msgid "To apply all changes instantly, you have to re-login."
 msgstr "如果想使所有調整立即生效，您必須重新登入。"
 
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
 msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
 msgid "_Re-Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "請檢查 Avahi 或是 Bonjour 是否已經安裝。"
 
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "請檢查 Avahi 或是 Bonjour 是否已經安裝。"
 
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Disable Account"
 msgstr "無效的帳號"
 
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "帳號 \"%s\" 已連線到伺服器"
 
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "All chat and group chat windows will be closed."
 msgstr "所有的聊天和多人聊天視窗將會關閉。您想繼續嗎?"
 
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
 #, fuzzy
 msgid "_Disable Account"
 msgstr "無效的帳號"
 
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
 #, fuzzy
 msgid "Label"
 msgstr "標籤"
 
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
 #, fuzzy
 msgid "Import Contacts"
 msgstr "邀請聯絡人(_C)"
 
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "客戶端證書"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Gajim 啟動時連線(_O)"
 
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "儲存與所有聯絡人的聊天記錄(_L)"
 
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
 #, fuzzy
 msgid "Global Status"
 msgstr "狀態"
 
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "變更一個或多個帳號狀態"
 
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
 msgid "Use file transfer proxies"
 msgstr "使用檔案傳輸代理伺服器"
 
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
 #, fuzzy
 msgid "Idle Time"
 msgstr "閒置，自從 %s"
 
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "客戶端證書"
 
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
 #, fuzzy
 msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
 msgstr "允許 Gajim 發送您正在執行的作業系統相關資訊。"
 
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "邀請聯絡人(_C)"
 
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "忽略聯絡人清單以外的聯絡人觸發的事件(_I)"
 
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
 #, fuzzy
 msgid "Priority"
 msgstr "優先等級(_T):"
 
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
 #, fuzzy
 msgid "Use environment variable"
 msgstr "使用 HTTP__PROXY 環境變數(_U)"
 
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "變更一個或多個帳號狀態"
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
 #, fuzzy
 msgid "First Name"
 msgstr "名稱:"
 
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
 #, fuzzy
 msgid "Last Name"
 msgstr "姓:"
 
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
 #, fuzzy
 msgid "Email"
 msgstr "新電子郵件"
 
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
 #, fuzzy
 msgid "Adjust to status"
 msgstr "依據狀態調整(_A)"
 
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
 #, fuzzy
 msgid "Enable"
 msgstr "啟用"
 
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
 #, fuzzy
 msgid "Port"
 msgstr "連接埠(_P):"
 
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Connection Settings"
 msgstr "連線"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "客戶端證書"
+
+#: gajim/gtk/accounts.py:817
 msgid "PKCS12 Files"
 msgstr "PKCS12 檔案"
 
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "客戶端證書"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "客戶端證書"
 
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
 #, fuzzy
 msgid "Save Password"
 msgstr "儲存密碼"
 
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
 #, fuzzy
 msgid "Login Settings"
 msgstr "外掛程式"
@@ -10905,19 +10876,19 @@ msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "移除了 %s 聯絡人"
 
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
 msgid "Unknown Artist"
 msgstr "不明演出者"
 
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
 msgid "Unknown Title"
 msgstr "不明標題"
 
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
 msgid "Unknown Source"
 msgstr "不明來源"
 
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10931,20 +10902,20 @@ msgstr ""
 msgid "Bookmarks for %s"
 msgstr "將本聊天室加入書籤(_B)"
 
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
 msgid "Archive corrupted"
 msgstr "存檔已損壞"
 
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
 msgid "Archive empty"
 msgstr "存檔為空"
 
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
 #: gajim/plugins/gui.py:273
 msgid "Archive is malformed"
 msgstr "存檔異常"
 
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "外掛程式已經存在"
@@ -10999,127 +10970,244 @@ msgstr ""
 msgid "Show next pending event"
 msgstr "顯示所有未處理事件(_E)"
 
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
 msgid ""
 "Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
 "you can chat through various XMPP services of your choice (e.g. Jabber.org) "
 "as well as transports (e.g. Facebook, IRC)."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
 msgid ""
 "Just chat with your friends or family, easily share pictures and thoughts or "
 "discuss the news with your groups."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
 msgid ""
 "Gajim integrates well with your other devices: just chat and see what's been "
 "said on your mobile device."
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
 #, fuzzy
 msgid "Features:"
 msgstr "特性"
 
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
 msgid "Never miss a message, keep all your chat clients synchronized"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Invite friends to group chats or join one"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Use your favorite emoticons, set your own profile picture"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Keep and manage all your chat history"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Organize your chats with tabs"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
 #, fuzzy
 msgid "Automatic spell-checking for your messages"
 msgstr "對正在編輯的訊息進行拼寫檢查。"
 
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
 msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
 msgid ""
 "Lookup things on Wikipedia, dictionaries or other search engines directly "
 "from the chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
 msgid ""
 "Set your activity, tune, and mood to show your friends how you are feeling"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
 msgid "Support for multiple accounts"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Group multiple contacts from one friend to a single Meta-Contact"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "XML console to see what's happening on the protocol layer"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
 msgid "Serverless messaging (Bonjour/Zeroconf)"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
 #, fuzzy
 msgid "Support for service discovery including nodes and search for users"
 msgstr "正在使用帳號 %s 來發掘服務"
 
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
 msgid "Even more features via plugins"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
 #, fuzzy
 msgid "Contact list"
 msgstr "聯絡人"
 
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
 msgid "Tabbed chat window"
 msgstr ""
 
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
 msgid "Group chat support"
 msgstr "多人聊天"
 
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
 #, fuzzy
 msgid "Chat history"
 msgstr "最近:"
 
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
 #, fuzzy
 msgid "Plugin manager"
 msgstr "外掛程式失敗"
 
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "繼續對話"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "不明的 SSL 錯誤: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "兩次檢查閒置之間的時間間隔。"
+
+#, fuzzy
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "語言 %s 的詞典無法使用"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "您必須安裝 %s 詞典才能使用拼寫檢查，或是在拼寫檢查語言選項中設定另一種語"
+#~ "言。\n"
+#~ "高亮度拼寫錯誤的特性不會被啟用。"
+
+#~ msgid "_Reconnect"
+#~ msgstr "重新連線(_R)"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "只顯示活動的聯絡人(_A)"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "加入聯絡人(_A)…"
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "邀請聯絡人(_C)"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "離開聊天室"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "新聊天室"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "如果為真， Gajim 會在每個含有未讀訊息的標籤上顯示一個圖示。根據主題，該圖"
+#~ "示可能是動態的。"
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "伺服器名稱必須在 1 到 1023 個字元之間"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "主機名稱中有無效的字元。"
+
+#~ msgid "Server address required."
+#~ msgstr "伺服器的位址是必須的。"
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "使用者名稱必須在 1 到 1023 個字元之間"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "在使用者名稱中有無效的字元。"
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "資源必須在 1 到 1023 個字元之間"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "資源中含有無效字元。"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "提醒我聯絡人登入(_I)"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "提醒我聯絡人登出(_O)"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "在彈出提示中預覽訊息?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "檔案傳輸完成時提醒我(_N)"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "檔案傳輸完成時提醒我(_N)"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "當聯絡人剛剛登入時的背景色。"
+
+#~ msgid "Event Type"
+#~ msgstr "事件類型"
+
+#~ msgid "Event desc"
+#~ msgstr "事件"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "尚未連線到伺服器"
+
 #~ msgid "Resource Conflict"
 #~ msgstr "資源衝突"
 
@@ -11759,9 +11847,6 @@ msgstr "外掛程式失敗"
 #~ msgid "_Send Private Message"
 #~ msgstr "傳送私人聊天訊息(_S)"
 
-#~ msgid "Send _File"
-#~ msgstr "傳送檔案(_F)"
-
 #, fuzzy
 #~ msgid "Participant Actions"
 #~ msgstr "參與者"
@@ -14414,9 +14499,6 @@ msgstr "外掛程式失敗"
 #~ "如果用於接收訊息的預設連接埠不合適，您可以在這裡選擇另外一個。\n"
 #~ "您可能需要變更防火牆設定。"
 
-#~ msgid "Mer_ge accounts"
-#~ msgstr "合併帳號(_G)"
-
 #~ msgid "OpenPGP is not usable on this computer"
 #~ msgstr "OpenPGP 在這臺電腦上無法使用"
 
@@ -14951,9 +15033,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Requires python-gnome2."
 #~ msgstr "需要 python-gnome2。"
 
-#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-#~ msgstr "需要 gnome-keyring 和 python-gnome2-desktop，或 kwalletcli。"
-
 #~ msgid "SRV"
 #~ msgstr "SRV"